Pull out the OPENCL_SHADER check as a pass option.

Change-Id: Iaf2520bf450cc7e1311ffeb030dbc6e3fde07160

Author: scottp101

IGC/Compiler/CISACodeGen/MemOpt.cpp

@@ -80,6 +80,8 @@ namespace {
         CodeGenContext* CGC;
         TargetLibraryInfo* TLI;
 
+        bool AllowNegativeSymPtrsForLoad = false;
+
         // Map of profit vector lengths per scalar type. Each entry specifies the
         // profit vector length of a given scalar type.
         // NOTE: Prepare the profit vector lengths in the *DESCENDING* order.
@@ -94,9 +96,9 @@ namespace {
     public:
         static char ID;
 
-        MemOpt() :
+        MemOpt(bool AllowNegativeSymPtrsForLoad = false) :
             FunctionPass(ID), DL(nullptr), AA(nullptr), SE(nullptr), WI(nullptr),
-            CGC(nullptr) {
+            CGC(nullptr), AllowNegativeSymPtrsForLoad(AllowNegativeSymPtrsForLoad) {
             initializeMemOptPass(*PassRegistry::getPassRegistry());
         }
 
@@ -354,8 +356,8 @@ namespace {
     };
 }
 
-FunctionPass* createMemOptPass() {
-    return new MemOpt();
+FunctionPass* createMemOptPass(bool AllowNegativeSymPtrsForLoad) {
+    return new MemOpt(AllowNegativeSymPtrsForLoad);
 }
 
 #define PASS_FLAG     "igc-memopt"
@@ -616,8 +618,7 @@ bool MemOpt::mergeLoad(LoadInst* LeadingLoad,
                 continue;
             }
             else {
-                if (CGC->type != ShaderType::OPENCL_SHADER &&
-                    LeadingSymPtr.Offset < 0)
+                if (!AllowNegativeSymPtrsForLoad && LeadingSymPtr.Offset < 0)
                     continue;
             }
         }

IGC/Compiler/CISACodeGen/MemOpt.h

@@ -52,6 +52,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "Compiler/CISACodeGen/ShaderCodeGen.hpp"
 
 void initializeMemOptPass(llvm::PassRegistry&);
-llvm::FunctionPass* createMemOptPass();
+llvm::FunctionPass* createMemOptPass(bool AllowNegativeSymPtrsForLoad);
 
 #endif // _CISA_MEMOPT_H_

IGC/Compiler/CISACodeGen/ShaderCodeGen.cpp

@@ -508,7 +508,9 @@ namespace IGC
             ctx.m_instrTypes.hasLoadStore && IGC_IS_FLAG_DISABLED(DisableMemOpt)) {
             if (IGC_IS_FLAG_ENABLED(EnableAdvMemOpt))
               mpm.add(createAdvMemOptPass());
-            mpm.add(createMemOptPass());
+            bool AllowNegativeSymPtrsForLoad =
+                ctx.type == ShaderType::OPENCL_SHADER;
+            mpm.add(createMemOptPass(AllowNegativeSymPtrsForLoad));
             mpm.add(createIGCInstructionCombiningPass());
         }