Changeset 3111 in CLRX

Timestamp:

May 31, 2017, 8:50:36 AM (2 years ago)

Author:

matszpk

Message:

CLRadeonExtender: GNAsm: Fixed comment in testcases. Simplify comparison of words.

Location:

CLRadeonExtender/trunk

Files:

• amdasm/GCNAsmHelpers.cpp (modified) (1 diff)
• amdasm/GCNAssembler.cpp (modified) (3 diffs)
• tests/amdasm/GCNAsmOpc14.cpp (modified) (1 diff)

CLRadeonExtender/trunk/amdasm/GCNAsmHelpers.cpp

@@ -1003 +1003 @@
         if ((arch & ARCH_GCN_1_2_4)!=0 &&
             (instrOpMask & (INSTROP_NOSEXT|INSTROP_VOP3P))==0 &&
-            linePtr+4 <= end && toLower(linePtr[0])=='s' &&
-            toLower(linePtr[1])=='e' && toLower(linePtr[2])=='x' &&
-            toLower(linePtr[3])=='t')
+            linePtr+4 <= end && strncasecmp(linePtr, "sext", 4)==0)
         {   /* sext */
             linePtr += 4;

CLRadeonExtender/trunk/amdasm/GCNAssembler.cpp

@@ -3529 +3529 @@
         skipSpacesToEnd(linePtr, end);
         if (flatMode == GCN_FLAT_SCRATCH && linePtr+3<end &&
-            toLower(linePtr[0])=='o' && toLower(linePtr[1])=='f' &&
-            toLower(linePtr[2])=='f' && (linePtr+3==end || !isAlnum(linePtr[3])))
-        { // if off
+            strncasecmp(linePtr, "off", 3)==0 && (linePtr+3==end || !isAlnum(linePtr[3])))
+        { // // if 'off' word
             vaddrOff = true;
             linePtr+=3;
@@ -3547 +3546 @@
         skipSpacesToEnd(linePtr, end);
         if (flatMode == GCN_FLAT_SCRATCH && linePtr+3<end &&
-            toLower(linePtr[0])=='o' && toLower(linePtr[1])=='f' &&
-            toLower(linePtr[2])=='f' && (linePtr+3==end || !isAlnum(linePtr[3])))
-        { // if off
+            strncasecmp(linePtr, "off", 3)==0 && (linePtr+3==end || !isAlnum(linePtr[3])))
+        { // if 'off' word
             vaddrOff = true;
             linePtr+=3;
@@ -3587 +3585 @@
             return false;
         skipSpacesToEnd(linePtr, end);
-        if (flatMode != 0 && linePtr+3<end &&
-            toLower(linePtr[0])=='o' && toLower(linePtr[1])=='f' &&
-            toLower(linePtr[2])=='f' && (linePtr+3==end || !isAlnum(linePtr[3])))
-        { // if off
+        if (flatMode != 0 && linePtr+3<end && strncasecmp(linePtr, "off", 3)==0 &&
+            (linePtr+3==end || !isAlnum(linePtr[3])))
+        {  // if 'off' word
             saddrOff = true;
             linePtr+=3;

CLRadeonExtender/trunk/tests/amdasm/GCNAsmOpc14.cpp

@@ -718 +718 @@
     { "scratch_load_short_d16_hi v47, off, s49 glc slc\n",
         0xdc974000U, 0x2f3100ffU, true, true, "" },
-    /* FLAT GLOBAL scope */
+    /* FLAT GLOBAL encoding */
     { "global_load_ubyte v47, v[187:188], s[50:51] glc slc\n",
         0xdc438000U, 0x2f3200bbU, true, true, "" },