P4 to Git Change 1451977 by lmoriche@lmoriche_opencl_dev2 on 2017/08/26 00:40:17

SWDEV-116136 - Support -Og for Clang
	- Add missed changes mentioned in the code review.

Affected files ...

... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/backends/common/codegen.cpp#4 edit
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/backends/common/opt_level.cpp#3 edit
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/backends/gpu/scwrapper/scState.cpp#8 edit
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/utils/options.cpp#6 edit
... //depot/stg/opencl/drivers/opencl/compiler/legacy-lib/utils/options.hpp#6 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/codegen.cpp#74 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/backends/common/opt_level.cpp#34 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/options.cpp#43 edit
... //depot/stg/opencl/drivers/opencl/compiler/lib/utils/options.hpp#20 edit


[ROCm/clr commit: de1c5f6d0d]
This commit is contained in:
foreman
2017-08-26 00:57:57 -04:00
vanhempi f340618f4c
commit fa37a08a8c
4 muutettua tiedostoa jossa 13 lisäystä ja 21 poistoa
@@ -485,10 +485,10 @@ llvmCodeGen(
assert(!"Error with optimization level");
case amd::option::OPT_O2: // -O2
case amd::option::OPT_O5: // -O5
case amd::option::OPT_OG: // -Og
case amd::option::OPT_OS: // -Os
OLvl = CodeGenOpt::Default;
break;
case amd::option::OPT_OG: // -Og
case amd::option::OPT_O3: // -O3
case amd::option::OPT_O4: // -O4
OLvl = CodeGenOpt::Aggressive;
@@ -71,10 +71,10 @@ OptLevel::setup(aclBinary *elf, bool isGPU, uint32_t OptLevel)
break;
case amd::option::OPT_O2: // -O2
case amd::option::OPT_O5: // -O5
case amd::option::OPT_OG: // -Og
case amd::option::OPT_OS: // -Os
OLvl = CodeGenOpt::Default;
break;
case amd::option::OPT_OG: // -Og
case amd::option::OPT_O3: // -O3
case amd::option::OPT_O4: // -O4
OLvl = CodeGenOpt::Aggressive;
@@ -278,7 +278,7 @@ int
OgOptLevel::optimize(aclBinary *elf, Module *input, bool isGPU)
{
module_ = input;
setup(elf, isGPU, 3);
setup(elf, isGPU, 2);
run(elf);
return 0;
}
@@ -758,14 +758,6 @@ processOption(int OptDescTableIx, Options& Opts, const std::string& Value,
}
break;
case OID_OptLevel:
if (ival == 'g') {
#if defined(WITH_LIGHTNING_COMPILER)
Opts.clangOptions.push_back("-Og");
#endif
}
break;
case OID_FiniteMathOnly:
Opts.setFlag(OID_FiniteMathOnly, 1);
tod = &OptDescTable[OID_FiniteMathOnly];
@@ -181,16 +181,16 @@ enum DumpFlags {
DUMP_ALL = 0x00007FFF // Everything
};
enum OptLevelFlags {
OPT_O0 = 48, // No optimization setting.
OPT_O1 = 49,
OPT_O2 = 50,
OPT_O3 = 51,
OPT_O4 = 52,
OPT_O5 = 53,
OPT_OG = 103, // g ASCII
OPT_OS = 115, // s ASCII
OPT_Error = 116, // Invalid optimization set
enum OptLevelFlags : unsigned char {
OPT_O0 = '0', // No optimization setting.
OPT_O1 = '1',
OPT_O2 = '2',
OPT_O3 = '3',
OPT_O4 = '4',
OPT_O5 = '5',
OPT_OG = 'g', // g ASCII
OPT_OS = 's', // s ASCII
OPT_Error = 0, // Invalid optimization set
/** Canary Value that guards against enum changes
* @warning This value cannot be changed without updating the appropriate
* tests and should NEVER be decreased.