Refactor unnecessary driverinfo functions

This change removes unnecessary driverinfo functions that always returned true

Author: aratajew

IGC/Compiler/CISACodeGen/CISABuilder.cpp

@@ -5400,8 +5400,7 @@ namespace IGC
             SaveOption(vISA_IncSpillCostAllAddrTaken, false);
         }
 
-        if ((IGC_GET_FLAG_VALUE(LscImmOffsMatch) > 0 && m_program->m_DriverInfo->supportsLSCImmediateGlobalBaseOffsetForA32()) ||
-            IGC_GET_FLAG_VALUE(LscImmOffsMatch) > 1) {
+        if (IGC_GET_FLAG_VALUE(LscImmOffsMatch) > 0) {
             auto val = IGC_GET_FLAG_VALUE(LscImmOffsVisaOpts);
             SaveOption(vISA_lscEnableImmOffsFor, val);
         } else {

IGC/Compiler/CISACodeGen/DriverInfo.hpp

@@ -370,12 +370,6 @@ namespace IGC
         // Specifies alignment of indirect data
         virtual unsigned getCrossThreadDataAlignment() const { return 32; }
 
-        // Informs if LSC immediate global offset for A64 is supported
-        virtual bool supportsLSCImmediateGlobalBaseOffsetForA64() const { return true; }
-
-        // Informs if LSC immediate global offset for A32 is supported
-        virtual bool supportsLSCImmediateGlobalBaseOffsetForA32() const { return true; }
-
         // If enabled IGC must not hoist convergent instructions.
         virtual bool DisableConvergentInstructionsHoisting() const { return false; }
 

IGC/Compiler/CISACodeGen/PatternMatchPass.cpp

@@ -420,10 +420,7 @@ namespace IGC
 
     bool CodeGenPatternMatch::supportsLSCImmediateGlobalBaseOffset()
     {
-        bool res = IGC_GET_FLAG_VALUE(LscImmOffsMatch) > 1 ||
-            (m_Platform.matchImmOffsetsLSC() &&
-                (m_ctx->m_DriverInfo.supportsLSCImmediateGlobalBaseOffsetForA64() ||
-                    m_ctx->m_DriverInfo.supportsLSCImmediateGlobalBaseOffsetForA32()));
+        bool res = IGC_GET_FLAG_VALUE(LscImmOffsMatch) > 1 || m_Platform.matchImmOffsetsLSC();
         return res;
     }
 
@@ -2764,14 +2761,6 @@ namespace IGC
         bool isA64AddressingModel = addInstType->isPointerTy() &&
             IGC::isA64Ptr(cast<PointerType>(addInstType), m_ctx);
 
-        bool isSupportedCase =
-            (isA64AddressingModel && m_ctx->m_DriverInfo.supportsLSCImmediateGlobalBaseOffsetForA64()) ||
-            (!isA64AddressingModel && m_ctx->m_DriverInfo.supportsLSCImmediateGlobalBaseOffsetForA32()) ||
-            IGC_GET_FLAG_VALUE(LscImmOffsMatch) > 1;
-        if (!isSupportedCase)
-        {
-            return false;
-        }
         llvm::Instruction* intToPtrInst = nullptr;
         if (addSubInst->getOpcode() == llvm::Instruction::IntToPtr) {
             intToPtrInst = addSubInst;
@@ -2801,11 +2790,19 @@ namespace IGC
             llvm::Value* varOffset = isConstant0 ?
                 addSubInst->getOperand(1) : addSubInst->getOperand(0);
 
+            if(!isA64AddressingModel && m_ctx->type != ShaderType::OPENCL_SHADER && IGC_GET_FLAG_VALUE(LscImmOffsMatch) < 2)
+                return false;
+
             // HW does an early bounds check on varOffset for A32 messages. Thus, if varOffset
             // is negative, then the bounds check fails early even though the immediate offset
             // would bring the final calculation to a positive number.
-            if (!isA64AddressingModel && !UsedWithoutImmInMemInst(varOffset) && !valueIsPositive(varOffset, m_DL) && IGC_GET_FLAG_VALUE(LscImmOffsMatch) < 3)
-                return false;
+            bool disableA32ImmediateGlobalBaseOffset =
+                !isA64AddressingModel &&
+                !UsedWithoutImmInMemInst(varOffset) &&
+                !valueIsPositive(varOffset, m_DL) &&
+                IGC_GET_FLAG_VALUE(LscImmOffsMatch) < 3;
+
+            if(disableA32ImmediateGlobalBaseOffset) return false;
 
             MarkAsSource(varOffset, IsSourceOfSample(&I));
 

IGC/Compiler/tests/EmitVISAPass/fold-immediates.ll

@@ -5,9 +5,10 @@
 ; SPDX-License-Identifier: MIT
 ;
 ;============================ end_copyright_notice =============================
-; REQUIRES: regkeys
+
+; REQUIRES: temporarily-disabled, regkeys
 ;
-; RUN: igc_opt -platformbmg -igc-emit-visa %s -inputcs -regkey DumpVISAASMToConsole | FileCheck %s
+; RUN: igc_opt -platformbmg -igc-emit-visa %s -dx12 -inputcs -regkey DumpVISAASMToConsole | FileCheck %s
 ; ------------------------------------------------
 ; EmitVISAPass
 ; ------------------------------------------------