option parsing improvement, etc..

option parsing emits the malformed option

Author: trbauer

visa/Optimizer.cpp

@@ -8041,9 +8041,12 @@ bool Optimizer::foldPseudoAndOr(G4_BB* bb, INST_LIST_ITER& ii)
         int addrSubreg = 2;
 
         G4_BB* perThreadBB = nullptr;
-        // load per-thread data, if any. per-thread data always start from r1
+        // Load per-thread data, if any. Per-thread data always start from r1
         // this is a fixed size 8 inst (nop padded as necessary), which may be skipped
-        // by runtime if the local_id are auto-generated by HW
+        // by runtime if the local_id are auto-generated by HW.
+        //
+        // The size of this first block must be a multiple of 64B so that the
+        // forward start label is 64B aligned.
         if (builder.needsToLoadLocalID())
         {
             int PTIS = kernel.getInt32KernelAttr(Attributes::ATTR_PerThreadInputSize);
@@ -8116,8 +8119,8 @@ bool Optimizer::foldPseudoAndOr(G4_BB* bb, INST_LIST_ITER& ii)
             if (useInlineData)
             {
                 // copy inline data GRF
-                // (W) mov (8) r4.0:ud r1.0
-                moveGRF((startGRF + numPerThreadGRF), startGRF);
+                // (W) mov (8) r4.0:ud r1.0:ud
+                moveGRF(startGRF + numPerThreadGRF, startGRF);
             }
 
             {

visa/Option.cpp

@@ -75,6 +75,7 @@ bool Options::parseOptions(int argc, const char* argv[])
     {
         if (argv[i] == NULL)
         {
+            std::cerr << "INTERNAL ERROR: nullptr argv element\n";
             return false;
         }
         // If arg not defined in the .def file, exit with an error
@@ -96,7 +97,7 @@ bool Options::parseOptions(int argc, const char* argv[])
             }
             if (*end != 0) {
                 parseError = true;
-                std::cerr << argv[i] << ": malformed integer\n";
+                std::cerr << it->first << ": " << argv[i] << ": malformed integer\n";
                 return false;
             }
             val = x;
@@ -108,7 +109,7 @@ bool Options::parseOptions(int argc, const char* argv[])
                 return false;
             if (val64 > (uint64_t)std::numeric_limits<uint32_t>::max()) {
                 parseError = true;
-                std::cerr << argv[i] << ": malformed integer (value too large for 32b)\n";
+                std::cerr << it->first << ": " << argv[i] << ": malformed integer (value too large for 32b)\n";
                 return false;
             }
             val = (uint32_t)val64;
@@ -134,7 +135,7 @@ bool Options::parseOptions(int argc, const char* argv[])
             i++;
             if (i >= argc) {
                 const char *errorMsg = m_vISAOptions.getErrorMsg(vISAOpt);
-                std::cerr << errorMsg << "\n";
+                std::cerr << it->first << ": argument expected: " << errorMsg << "\n";
                 return false;
             }
             switch (type) {
@@ -167,7 +168,7 @@ bool Options::parseOptions(int argc, const char* argv[])
                 }
                 i++;
                 if (i >= argc) {
-                    std::cerr << "vISA option type ET_2xINT32 requires two integer arguments\n";
+                    std::cerr << it->first << ": vISA option type ET_2xINT32 requires two integer arguments\n";
                     return false;
                 }
                 uint32_t lo32 = 0;

visa/include/VISAOptionsDefs.h

@@ -24,8 +24,9 @@ SPDX-License-Identifier: MIT
 
 //=== Debugging options ===
 DEF_VISA_OPTION(vISA_DumpPasses,            ET_BOOL, "-dumpPassesAll",   UNUSED, false)
-// subsumes the above (should replace; 0 = none, 1 = some, 2 = all)
-DEF_VISA_OPTION(vISA_DumpPassesSubset,      ET_INT32, "-dumpPassesSubset", UNUSED, 0)
+// subsumes the above (should replace; 0 = none, 1 = only when modifications are present, 2 = all)
+DEF_VISA_OPTION(vISA_DumpPassesSubset,      ET_INT32, "-dumpPassesSubset",
+  "0 means none; 1 means only when modifications happen; 2 means all passes", 0)
 // dump out dot file for debugging
 DEF_VISA_OPTION(vISA_DumpDot,               ET_BOOL, "-dot",             UNUSED, false)
 DEF_VISA_OPTION(vISA_DumpDotAll,            ET_BOOL, "-dotAll",          UNUSED, false)