Changeset 4869 in CLRX

Timestamp:

Jul 28, 2019, 7:14:23 PM (3 weeks ago)

Author:

matszpk

Message:

CLRadeonExtender: GCNAsm: Next FLAT testcases for GFX10. Fix resolving FLAT field value (GFX10).

Location:

CLRadeonExtender/trunk

Files:

• CLRX/amdasm/GCNDefs.h (modified) (1 diff)
• amdasm/GCNAsmEncode2.cpp (modified) (1 diff)
• amdasm/GCNAssembler.cpp (modified) (1 diff)
• tests/amdasm/GCNAsmOpc15.cpp (modified) (2 diffs)

CLRadeonExtender/trunk/CLRX/amdasm/GCNDefs.h

@@ -48 +48 @@
     GCNTGT_INSTOFFSET,
     GCNTGT_INSTOFFSET_S,
-    GCNTGT_VOP3LITIMM
+    GCNTGT_VOP3LITIMM,
+    GCNTGT_INSTOFFSET_GFX10
 };
 

CLRadeonExtender/trunk/amdasm/GCNAsmEncode2.cpp

@@ -1256 +1256 @@
     
     if (instOffsetExpr!=nullptr)
-        instOffsetExpr->setTarget(AsmExprTarget(flatMode!=0 ?
-                    GCNTGT_INSTOFFSET_S : GCNTGT_INSTOFFSET, asmr.currentSection,
-                    output.size()));
+        instOffsetExpr->setTarget(AsmExprTarget(isGCN15 ? GCNTGT_INSTOFFSET_GFX10 :
+                    (flatMode!=0 ? GCNTGT_INSTOFFSET_S : GCNTGT_INSTOFFSET),
+                    asmr.currentSection, output.size()));
     
     // put data (instruction words)

CLRadeonExtender/trunk/amdasm/GCNAssembler.cpp

@@ -445 +445 @@
             sectionData[offset+1] = (sectionData[offset+1]&0xf0) | ((value&0xf00)>>8);
             printWarningForRange(12, value, sourcePos, WS_UNSIGNED);
+            return true;
+        case GCNTGT_INSTOFFSET_GFX10:
+            // FLAT unsigned inst_offset
+            if (sectionId != ASMSECT_ABS)
+                GCN_FAIL_BY_ERROR(sourcePos,
+                        "Relative value is illegal in offset expressions")
+            sectionData[offset] = value;
+            sectionData[offset+1] = (sectionData[offset+1]&0xf0) | ((value&0x700)>>8);
+            printWarningForRange(11, value, sourcePos, WS_UNSIGNED);
             return true;
         case GCNTGT_INSTOFFSET_S:

CLRadeonExtender/trunk/tests/amdasm/GCNAsmOpc15.cpp

@@ -3237 +3237 @@
     { "flat_load_ubyte v47, v[187:188] glc", 0xdc210000U, 0x2f7d00bbU, true, true, "" },
     { "flat_load_ubyte v47, v[187:188] glc   ", 0xdc210000U, 0x2f7d00bbU, true, true, "" },
+    { "flat_load_ubyte v47, v[187:188] dlc glc", 0xdc211000U, 0x2f7d00bbU, true, true, "" },
     { "flat_load_ubyte v47, v[187:188]", 0xdc200000U, 0x2f7d00bbU, true, true, "" },
     { "flat_load_ubyte v47, v[187:188]   ", 0xdc200000U, 0x2f7d00bbU, true, true, "" },
@@ -3242 +3243 @@
         0xdc230000U, 0x2f7d00bbU, true, true, "" },
     { "flat_load_ubyte v47, v[187:188] slc\n", 0xdc220000U, 0x2f7d00bbU, true, true, "" },
+    { "flat_load_ubyte v47, v[187:188] inst_offset:2003 dlc\n",
+        0xdc2017d3U, 0x2f7d00bbU, true, true, "" },
+    { "flat_load_ubyte v47, v[187:188] offset:2003 dlc\n",
+        0xdc2017d3U, 0x2f7d00bbU, true, true, "" },
+    { "flat_load_ubyte v47, v[187:188] offset:0x13d4d dlc\n", 0xdc20154dU, 0x2f7d00bbU,
+        true, true, "test.s:1:40: Warning: Value 0x13d4d truncated to 0x54d\n" },
+    { "xv=2004; flat_load_ubyte v47, v[187:188] offset:xv dlc\n",
+        0xdc2017d4U, 0x2f7d00bbU, true, true, "" },
+    { "flat_load_ubyte v47, v[187:188] offset:xy dlc; xy=2005\n",
+        0xdc2017d5U, 0x2f7d00bbU, true, true, "" },
+    { "yb=0x13aa; flat_load_ubyte v47, v[187:188] offset:yb dlc\n",
+        0xdc2013aaU, 0x2f7d00bbU, true, true,
+        "test.s:1:51: Warning: Value 0x13aa truncated to 0x3aa\n" },
+    { "yb=0x1baa; flat_load_ubyte v47, v[187:188] offset:yb dlc\n",
+        0xdc2013aaU, 0x2f7d00bbU, true, true,
+        "test.s:1:51: Warning: Value 0x1baa truncated to 0x3aa\n" },
+    { "flat_load_ubyte v47, v[187:188] offset:yb dlc; yb=0x19ee\n",
+        0xdc2011eeU, 0x2f7d00bbU, true, true,
+        "test.s:1:40: Warning: Value 0x19ee truncated to 0x1ee\n" },
     /* FLAT errors */
     { "flat_load_ubyte v47, v[187:188] glc slcx", 0, 0, false, false,