From e1382f2d12e611844614aaebf4ba7b7422d941f0 Mon Sep 17 00:00:00 2001 From: foreman Date: Wed, 19 Aug 2015 00:25:53 -0400 Subject: [PATCH] P4 to Git Change 1181925 by marsenau@marsenau_home on 2015/08/19 00:14:53 ECR #304775 - Remove HLC_Unroll_* variables. HLC_Unroll_Scratch_Threshold was unused. The others have equivalent settings in the AMDLLVMContextHook, so consistently use that version. The patches to opt were already had different set of command line flags for the same options. This changes two of the defaults in compiler library and the equivalent flags in opt to match the values which were actually in use so this shoudn't change the current behavior. The unroll threshold default and allow partial unrolling defaults were changed to the actually used default values. Eventually all of these custom options should be removed, because in current LLVM these can be controlled per loop by the TargetTransformInfo, and all have equivalent cl::opts already. Affected files ... ... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/OPTIONS.def#128 edit ... //depot/stg/opencl/drivers/opencl/compiler/llvm/include/llvm/AMDLLVMContextHook.h#27 edit ... //depot/stg/opencl/drivers/opencl/compiler/llvm/include/llvm/Transforms/IPO/AMDOptOptions.h#7 edit ... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Transforms/IPO/AMDOptOptions.cpp#9 edit ... //depot/stg/opencl/drivers/opencl/compiler/llvm/lib/Transforms/IPO/AMDPassManagerBuilder.cpp#55 edit ... //depot/stg/opencl/drivers/opencl/compiler/llvm/tools/opt/amdopt.inc#25 edit [ROCm/clr commit: 5ad9c314c680bb771d1721985759c0489c31f981] --- projects/clr/rocclr/compiler/lib/utils/OPTIONS.def | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/clr/rocclr/compiler/lib/utils/OPTIONS.def b/projects/clr/rocclr/compiler/lib/utils/OPTIONS.def index 788786eb97..bd2f62ab13 100644 --- a/projects/clr/rocclr/compiler/lib/utils/OPTIONS.def +++ b/projects/clr/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, \ - 150, 0, 0x3FFFFFFF, NULL, \ + 800, 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, \ - true, 0, 0, NULL, \ + false, 0, 0, NULL, \ "Allow unrolling loops partially") // -licm=0|1 (deafault is 1)