Fixed bug that disables AddressArithmeticSinking

With update of retry mechanism to per-function level optimization, AddressArithmeticSinking was not being enabled properly.
This fix allows AddressArithmeticSinking to run correctly when enabled.

Author: dlei6g

IGC/Compiler/CISACodeGen/AddressArithmeticSinking.cpp

@@ -52,7 +52,8 @@ FunctionPass(ID), m_SinkingDepth(SinkingDepth)
 bool AddressArithmeticSinking::runOnFunction(Function& F)
 {
     auto ctx = getAnalysis<CodeGenContextWrapper>().getCodeGenContext();
-    if (isOptDisabledForFunction(ctx->getModuleMetaData(), getPassName(), &F))
+    if (IGC_IS_FLAG_DISABLED(ForceAddressArithSinking) &&
+        isOptDisabledForFunction(ctx->getModuleMetaData(), getPassName(), &F))
         return false;
 
     DT = &getAnalysis<DominatorTreeWrapperPass>().getDomTree();

IGC/Compiler/CISACodeGen/ShaderCodeGen.cpp

@@ -816,8 +816,7 @@ void AddLegalizationPasses(CodeGenContext& ctx, IGCPassManager& mpm, PSSignature
         mpm.add(createAggressiveDCEPass());
         // As DPC++ FE apply LICM we cannot reduce register pressure just
         // by turning off LICM at IGC in some cases so apply sinking address arithmetic
-        if (IGC_IS_FLAG_ENABLED(ForceAddressArithSinking) &&
-            ctx.type == ShaderType::OPENCL_SHADER)
+        if (ctx.type == ShaderType::OPENCL_SHADER)
         {
             mpm.add(new AddressArithmeticSinking());
         }