Changes in code.

Author: sys-igc

IGC/AdaptorOCL/OCL/sp/zebin_builder.cpp

@@ -392,12 +392,6 @@ void ZEBinaryBuilder::addSymbols(
             getSymbolElfBinding(sym), getSymbolElfType(sym),
             (sym.s_type == vISA::GenSymType::S_UNDEF) ? -1 : mGlobalConstSectID);
 
-    // add symbols defined in global string constant section
-    for (auto sym : symbols.globalStringConst)
-        mBuilder.addSymbol(sym.s_name, sym.s_offset, sym.s_size,
-            getSymbolElfBinding(sym), getSymbolElfType(sym),
-            (sym.s_type == vISA::GenSymType::S_UNDEF) ? -1 : mConstStringSectID);
-
     // add symbols defined in global section
     for (auto sym : symbols.global)
         mBuilder.addSymbol(sym.s_name, sym.s_offset, sym.s_size,

IGC/Compiler/CISACodeGen/CISABuilder.cpp

@@ -4873,17 +4873,8 @@ namespace IGC
                         symbols.global.emplace_back((vISA::GenSymType)sEntry.s_type,
                             sEntry.s_offset, sEntry.s_size, name.str());
                     else
-                    {
-                        // Global constants and string literals
-                        Constant * initializer = pGlobal->getInitializer();
-                        ConstantDataSequential * cds = dyn_cast<ConstantDataSequential>(initializer);
-                        if (cds && (cds->isCString() || cds->isString()))
-                            symbols.globalStringConst.emplace_back((vISA::GenSymType)sEntry.s_type,
-                                sEntry.s_offset, sEntry.s_size, name.str());
-                        else
-                            symbols.globalConst.emplace_back((vISA::GenSymType)sEntry.s_type,
-                                sEntry.s_offset, sEntry.s_size, name.str());
-                    }
+                        symbols.globalConst.emplace_back((vISA::GenSymType)sEntry.s_type,
+                            sEntry.s_offset, sEntry.s_size, name.str());
                 }
                 symbolTable.push_back(sEntry);
             }

IGC/Compiler/CodeGenPublic.h

@@ -95,12 +95,11 @@ namespace IGC
         typedef std::vector<vISA::ZERelocEntry> RelocListTy;
         typedef std::vector<vISA::ZEFuncAttribEntry> FuncAttrListTy;
         struct SymbolLists {
-            SymbolListTy function;          // function symbols
-            SymbolListTy global;            // global symbols
-            SymbolListTy globalConst;       // global constant symbols
-            SymbolListTy globalStringConst; // global string constant symbols
-            SymbolListTy sampler;           // sampler symbols
-            SymbolListTy local;             // local symbols
+            SymbolListTy function;    // function symbols
+            SymbolListTy global;      // global symbols
+            SymbolListTy globalConst; // global constant symbols
+            SymbolListTy sampler;     // sampler symbols
+            SymbolListTy local;       // local symbols
         };
 
     public: