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

Timestamp:

Feb 3, 2018, 9:07:40 PM (2 years ago)

Author:

matszpk

Message:

CLRadeonExtender: ROCm: First stuff do dump ROCm metadata. Print kernel config if DISASM_METADATA is not enabled.
Set reqWorkGroupSize, maxFlatWorkGroupSize and workGroupSizeHint to 0 by default (if not set).

File:

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

CLRadeonExtender/trunk/amdbin/ROCmBinaries.cpp

@@ -43 +43 @@
 {
     langVersion[0] = langVersion[1] = BINGEN_NOTSUPPLIED;
-    reqdWorkGroupSize[0] = reqdWorkGroupSize[1] =
-            reqdWorkGroupSize[2] = BINGEN_NOTSUPPLIED;
-    workGroupSizeHint[0] = workGroupSizeHint[1] =
-            workGroupSizeHint[2] = BINGEN_NOTSUPPLIED;
+    reqdWorkGroupSize[0] = reqdWorkGroupSize[1] = reqdWorkGroupSize[2] = 0;
+    workGroupSizeHint[0] = workGroupSizeHint[1] = workGroupSizeHint[2] = 0;
     kernargSegmentSize = BINGEN64_NOTSUPPLIED;
     groupSegmentFixedSize = BINGEN64_NOTSUPPLIED;
@@ -55 +53 @@
     vgprsNum = BINGEN_NOTSUPPLIED;
     maxFlatWorkGroupSize = BINGEN64_NOTSUPPLIED;
-    fixedWorkGroupSize[0] = fixedWorkGroupSize[1] =
-            fixedWorkGroupSize[2] = BINGEN_NOTSUPPLIED;
+    fixedWorkGroupSize[0] = fixedWorkGroupSize[1] = fixedWorkGroupSize[2] = 0;
     spilledSgprs = BINGEN_NOTSUPPLIED;
     spilledVgprs = BINGEN_NOTSUPPLIED;
@@ -967 +964 @@
                     canToNextLevel = true;
                     // initialize kernel attributes values
-                    kernel.reqdWorkGroupSize[0] = BINGEN_NOTSUPPLIED;
-                    kernel.reqdWorkGroupSize[1] = BINGEN_NOTSUPPLIED;
-                    kernel.reqdWorkGroupSize[2] = BINGEN_NOTSUPPLIED;
-                    kernel.workGroupSizeHint[0] = BINGEN_NOTSUPPLIED;
-                    kernel.workGroupSizeHint[1] = BINGEN_NOTSUPPLIED;
-                    kernel.workGroupSizeHint[2] = BINGEN_NOTSUPPLIED;
+                    kernel.reqdWorkGroupSize[0] = 0;
+                    kernel.reqdWorkGroupSize[1] = 0;
+                    kernel.reqdWorkGroupSize[2] = 0;
+                    kernel.workGroupSizeHint[0] = 0;
+                    kernel.workGroupSizeHint[1] = 0;
+                    kernel.workGroupSizeHint[2] = 0;
                     kernel.runtimeHandle.clear();
                     kernel.vecTypeHint.clear();
@@ -988 +985 @@
                     kernel.spilledVgprs = BINGEN_NOTSUPPLIED;
                     kernel.maxFlatWorkGroupSize = BINGEN64_DEFAULT;
-                    kernel.fixedWorkGroupSize[0] = BINGEN_NOTSUPPLIED;
-                    kernel.fixedWorkGroupSize[1] = BINGEN_NOTSUPPLIED;
-                    kernel.fixedWorkGroupSize[2] = BINGEN_NOTSUPPLIED;
+                    kernel.fixedWorkGroupSize[0] = 0;
+                    kernel.fixedWorkGroupSize[1] = 0;
+                    kernel.fixedWorkGroupSize[2] = 0;
                     inKernelCodeProps = true;
                     canToNextLevel = true;
@@ -1229 +1226 @@
 }
 
+void ROCmMetadata::parse(size_t metadataSize, const char* metadata)
+{
+    parseROCmMetadata(metadataSize, metadata, *this);
+}
+
 /*
  * ROCm binary reader and generator