P4 to Git Change 1125734 by emankov@em-hsa-amd on 2015/02/27 07:53:34

ECR #333753 - HSA HLC/Compiler Lib: Fix which restores global option HLC_Disable_Amd_Inline_All to false after switching stack HSAIL -> AMDIL on RT.

	Also it fixes ocl 20 conformance basic subtests (readimage, writeimage) failed on enabling calls (-hsail-enable-calls), where such switching takes place.

	Testing: smoke, precheck-in

	Reviewer: Daniil Fukalov

Affected files ...

... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/opt_level.cpp#22 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Transforms/IPO/AMDPassManagerBuilder.cpp#49 edit
... //depot/stg/opencl/drivers/opencl/compiler/llvm/tools/opt/amdopt.inc#22 edit

rocclr/compiler/lib/backends/common/opt_level.cpp

@@ -44,9 +44,10 @@ OptLevel::setup(bool isGPU, uint32_t OptLevel)
       } else {
         Builder.Inliner = createFunctionInliningPass(HLC_HSAIL_Inline_Threshold);
       }
-    } else 
+    } else
 #endif
     {
+      HLC_Disable_Amd_Inline_All = false;
       // Always create Inliner regardless of OptLevel
       Builder.Inliner = createFunctionInliningPass(500);
     }