From d09c098f87349471eb822edfbb6f5c65d49c03d2 Mon Sep 17 00:00:00 2001 From: foreman Date: Fri, 27 Feb 2015 08:24:42 -0500 Subject: [PATCH] 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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rocclr/compiler/lib/backends/common/opt_level.cpp b/rocclr/compiler/lib/backends/common/opt_level.cpp index 848332f15b..77aee790df 100644 --- a/rocclr/compiler/lib/backends/common/opt_level.cpp +++ b/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); }