Fix vISA options printing in the .asm file.

Change-Id: Ia0196145873275bc447f3d348b7f4144e763ebf8

Author: weiyu-chen

visa/FlowGraph.cpp

@@ -4241,9 +4241,10 @@ void G4_Kernel::emit_asm(std::ostream& output, bool beforeRegAlloc, void * binar
 
         output << "\n" << "//.platform " << platformString[getGenxPlatform()];
         output << "\n" << "//.stepping " << GetSteppingString();
-        output << "\n" << "//.CISA version " << (unsigned int)major_version
+        output << "\n" << "//.vISA version " << (unsigned int)major_version
             << "." << (unsigned int)minor_version;
-        output << "\n" << "//.options " << m_options->getArgString().str();
+        output << "\n" << "//.options_string \"" << m_options->getUserArgString().str() << "\"";
+        output << "\n" << "//.full_options \"" << m_options->getFullArgString() << "\"";
         output << "\n" << "//.instCount " << asmInstCount;
         output << "\n//.RA type\t" << RATypeString[RAType];
 

visa/Option.cpp

@@ -489,60 +489,70 @@ void Options::setOption(vISAOptions option, const char* str)
     setOptionInternally(option, str);
 }
 
-std::stringstream& Options::getArgString()
+//
+// return full set of arguments ever set by user, either through
+// string options or the various setOptions()
+//
+std::string Options::getFullArgString()
 {
-    if (argString.str().empty())
+    std::stringstream args;
+    // Collect all user-set options.
+    // This is for igc. When igc invokes vISA, it sets options
+    // via setOption() api instead of options string, thus leave
+    // argString empty. Here, we re-generate this options strings
+    // (This is for debugging)
+    for (int i = vISA_OPTIONS_UNINIT + 1; i < vISA_NUM_OPTIONS; ++i)
     {
-        // Collect all user-set options.
-        // This is for igc. When igc invokes vISA, it sets options
-        // via setOption() api instead of options string, thus leave
-        // argString empty. Here, we re-generate this options strings
-        // (This is for debugging)
-        for (int i = vISA_OPTIONS_UNINIT + 1; i < vISA_NUM_OPTIONS; ++i)
+        vISAOptions o = (vISAOptions)i;
+        if (isOptionSetByUser(o))
         {
-            vISAOptions o = (vISAOptions)i;
-            if (isOptionSetByUser(o))
-            {
-                EntryType type = m_vISAOptions.getType(o);
-                switch (type) {
-                case ET_BOOL:
-                    if (m_vISAOptions.getBool(o) != m_vISAOptions.getDefaultBool(o))
-                    {
-                        // Boolean option means the reverse of the default!
-                        // (Probably should avoid such reverse handling)
-                        argString << m_vISAOptions.getArgStr(o) << " ";
-                    }
-                    break;
-                case ET_INT32:
-                    argString << m_vISAOptions.getArgStr(o) << " "
-                              << m_vISAOptions.getUint32(o) << " ";
-                    break;
-                case ET_INT64:
-                    argString << m_vISAOptions.getArgStr(o) << " "
-                              << m_vISAOptions.getUint64(o) << " ";
-                    break;
-                case ET_2xINT32:
-                    {
-                        uint32_t lo32, hi32;
-                        uint64_t val = m_vISAOptions.getUint64(o);
-                        lo32 = (uint32_t)val;
-                        hi32 = (uint32_t)(val >> 32);
-                        argString << m_vISAOptions.getArgStr(o) << " "
-                                  << hi32 << " " << lo32 << " ";
-                    }
-                    break;
-                case ET_CSTR:
-                    argString << m_vISAOptions.getArgStr(o) << " "
-                              << m_vISAOptions.getCstr(o) << " ";
-                    break;
-                default:
-                    assert(false && "Invalid vISA option type!");
-                    argString << "UNDEFINED ";
-                    break;
+            EntryType type = m_vISAOptions.getType(o);
+            switch (type) {
+            case ET_BOOL:
+                if (m_vISAOptions.getBool(o) != m_vISAOptions.getDefaultBool(o))
+                {
+                    // Boolean option means the reverse of the default!
+                    // (Probably should avoid such reverse handling)
+                    args << m_vISAOptions.getArgStr(o) << " ";
                 }
+                break;
+            case ET_INT32:
+                args << m_vISAOptions.getArgStr(o) << " "
+                    << m_vISAOptions.getUint32(o) << " ";
+                break;
+            case ET_INT64:
+                args << m_vISAOptions.getArgStr(o) << " "
+                    << m_vISAOptions.getUint64(o) << " ";
+                break;
+            case ET_2xINT32:
+            {
+                uint32_t lo32, hi32;
+                uint64_t val = m_vISAOptions.getUint64(o);
+                lo32 = (uint32_t)val;
+                hi32 = (uint32_t)(val >> 32);
+                args << m_vISAOptions.getArgStr(o) << " "
+                    << hi32 << " " << lo32 << " ";
+            }
+            break;
+            case ET_CSTR:
+                args << m_vISAOptions.getArgStr(o) << " "
+                    << m_vISAOptions.getCstr(o) << " ";
+                break;
+            default:
+                assert(false && "Invalid vISA option type!");
+                args << "UNDEFINED ";
+                break;
             }
         }
     }
+    return args.str();
+}
+
+//
+// this returns the options string explicitly passed in by user
+//
+std::stringstream& Options::getUserArgString()
+{
     return argString;
 }
 

visa/Option.h

@@ -166,7 +166,8 @@ class Options {
 
     static void showUsage(std::ostream& output);
 
-    std::stringstream& getArgString();
+    std::stringstream& getUserArgString();
+    std::string getFullArgString();
     std::string getEncoderOutputFile();
     // Debug print of options
     void dump(void) const;

visa/include/VISAOptions.def

@@ -220,7 +220,7 @@ DEF_VISA_OPTION(vISA_clearAccBeforeEOT,             ET_BOOL,  "-clearAccBeforeEO
 DEF_VISA_OPTION(vISA_replaceIndirectCallWithJmpi,   ET_BOOL,  "-replaceIndirectCallWithJmpi",  UNUSED, false)
 DEF_VISA_OPTION(vISA_noMaskWA,                      ET_INT32, "-noMaskWA",  "USAGE: -noMaskWA <[0:1]=0 (off)|1|2|3(3=2), [2:3]=any>\n", 0)
 DEF_VISA_OPTION(vISA_forceNoMaskWA,                 ET_BOOL,  "-forceNoMaskWA",  UNUSED, false)
-DEF_VISA_OPTION(vISA_DstSrcOverlapWA,                 ET_BOOL,  "-dstSrcOverlapWA",  UNUSED, true)
+DEF_VISA_OPTION(vISA_DstSrcOverlapWA,               ET_BOOL,  "-dstSrcOverlapWA",  UNUSED, true)
 
 //=== HW debugging options ===
 DEF_VISA_OPTION(vISA_GenerateDebugInfo,   ET_BOOL,  "-generateDebugInfo", UNUSED, false)