Changeset 3681 in CLRX for CLRadeonExtender/trunk/amdbin/ROCmBinaries.cpp

Timestamp:

Jan 31, 2018, 7:18:52 AM (3 years ago)

Author:

matszpk

Message:

CLRadeonExtender: ROCmBin: Make constructors for ROCmMetadata and ROCmKernelMetadata. Initialize values for CodeProps? after opening it.
Reorder ROCmAccessQualifier enums.

File:

• CLRadeonExtender/trunk/amdbin/ROCmBinaries.cpp (modified) (6 diffs)

CLRadeonExtender/trunk/amdbin/ROCmBinaries.cpp

@@ -39 +39 @@
  * ROCm metadata YAML parser
  */
+
+ROCmKernelMetadata::ROCmKernelMetadata() :
+    langVersion{ BINGEN_NOTSUPPLIED, BINGEN_NOTSUPPLIED },
+    reqdWorkGroupSize{ BINGEN_NOTSUPPLIED, BINGEN_NOTSUPPLIED, BINGEN_NOTSUPPLIED },
+    workGroupSizeHint{ BINGEN_NOTSUPPLIED, BINGEN_NOTSUPPLIED, BINGEN_NOTSUPPLIED },
+    kernargSegmentSize(BINGEN64_NOTSUPPLIED),
+    groupSegmentFixedSize(BINGEN64_NOTSUPPLIED),
+    privateSegmentFixedSize(BINGEN64_NOTSUPPLIED),
+    kernargSegmentAlign(BINGEN64_NOTSUPPLIED),
+    wavefrontSize(BINGEN_NOTSUPPLIED),
+    sgprsNum(BINGEN_NOTSUPPLIED), vgprsNum(BINGEN_NOTSUPPLIED),
+    maxFlatWorkGroupSize(BINGEN64_NOTSUPPLIED),
+    fixedWorkGroupSize{ BINGEN_NOTSUPPLIED, BINGEN_NOTSUPPLIED, BINGEN_NOTSUPPLIED },
+    spilledSgprs(BINGEN_NOTSUPPLIED),
+    spilledVgprs(BINGEN_NOTSUPPLIED)
+{ }
+
+ROCmMetadata::ROCmMetadata() : version{ 0, 0 }
+{ }
 
 // return trailing spaces
@@ -574 +593 @@
 
 static const char* rocmAccessQualifierTbl[] =
-{ "ReadOnly", "WriteOnly", "ReadWrite", "Default" };
+{ "Default", "ReadOnly", "WriteOnly", "ReadWrite" };
 
 void parseROCmMetadata(size_t metadataSize, const char* metadata,
@@ -691 +710 @@
             inKernel = true;
             
-            kernels.push_back(ROCmKernelMetadata{});
+            kernels.push_back(ROCmKernelMetadata());
         }
         
@@ -712 +731 @@
                     break;
                 case ROCMMT_KERNEL_CODEPROPS:
+                    kernel.kernargSegmentSize = BINGEN64_DEFAULT;
+                    kernel.groupSegmentFixedSize = BINGEN64_DEFAULT;
+                    kernel.privateSegmentFixedSize = BINGEN64_DEFAULT;
+                    kernel.kernargSegmentAlign = BINGEN64_DEFAULT;
+                    kernel.wavefrontSize = BINGEN_DEFAULT;
+                    kernel.sgprsNum = BINGEN_DEFAULT;
+                    kernel.vgprsNum = BINGEN_DEFAULT;
+                    kernel.maxFlatWorkGroupSize = BINGEN64_DEFAULT;
                     inKernelCodeProps = true;
                     canToNextLevel = true;
@@ -778 +805 @@
                 case ROCMMT_CODEPROPS_FIXED_WORK_GROUP_SIZE:
                 {
-                    YAMLIntArrayConsumer<uint64_t> consumer(3, kernel.fixedWorkGroupSize);
+                    YAMLIntArrayConsumer<cxuint> consumer(3, kernel.fixedWorkGroupSize);
                     parseYAMLValArray(ptr, end, lineNo, level, &consumer);
                     break;
@@ -784 +811 @@
                 case ROCMMT_CODEPROPS_GROUP_SEGMENT_FIXED_SIZE:
                     kernel.groupSegmentFixedSize =
-                                parseYAMLIntValue<uint64_t>(ptr, end, lineNo);
+                                parseYAMLIntValue<cxuint>(ptr, end, lineNo);
                     break;
                 case ROCMMT_CODEPROPS_KERNARG_SEGMENT_ALIGN: