From adedfc7a667522c39829a645765fa7e14df70f5f Mon Sep 17 00:00:00 2001 From: foreman Date: Mon, 24 Aug 2015 15:37:10 -0400 Subject: [PATCH] P4 to Git Change 1183975 by marsenau@marsenau_home on 2015/08/24 15:19:19 EPR #425389 - Back out changelist 1181925 Although the compiler library sources are split, the build does not yet use this, so the wrong default value is being used for AMDIL vs. HSAIL Affected files ... ... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/OPTIONS.def#130 edit ... //depot/stg/opencl/drivers/opencl/compiler/llvm/include/llvm/AMDLLVMContextHook.h#28 edit ... //depot/stg/opencl/drivers/opencl/compiler/llvm/include/llvm/Transforms/IPO/AMDOptOptions.h#8 edit ... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Transforms/IPO/AMDOptOptions.cpp#10 edit ... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Transforms/IPO/AMDPassManagerBuilder.cpp#56 edit ... //depot/stg/opencl/drivers/opencl/compiler/llvm/tools/opt/amdopt.inc#26 edit --- rocclr/compiler/lib/utils/OPTIONS.def | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rocclr/compiler/lib/utils/OPTIONS.def b/rocclr/compiler/lib/utils/OPTIONS.def index 80c1075249..9d31dafcae 100644 --- a/rocclr/compiler/lib/utils/OPTIONS.def +++ b/rocclr/compiler/lib/utils/OPTIONS.def @@ -565,7 +565,7 @@ OPTION(OT_UINT32, \ OA_RUNTIME|OVIS_SUPPORT|OVA_REQUIRED|OA_SEPARATOR_EQUAL, \ "unroll-threshold", NULL, \ LUThreshold, \ - 800, 0, 0x3FFFFFFF, NULL, \ + 150, 0, 0x3FFFFFFF, NULL, \ "Set loop unroll threshold to for all loops") // -unroll-allow-partial : allow partial unroll @@ -573,7 +573,7 @@ OPTION(OT_BOOL, \ OA_RUNTIME|OVIS_SUPPORT|OVA_DISALLOWED, \ "unroll-allow-partial", NULL, \ LUAllowPartial, \ - false, 0, 0, NULL, \ + true, 0, 0, NULL, \ "Allow unrolling loops partially") // -licm=0|1 (deafault is 1)