Skip to content

Commit

Permalink
Add override option, linker pass flags only for GPU
Browse files Browse the repository at this point in the history
  • Loading branch information
@pvelesko
pvelesko committed Nov 7, 2024
1 parent b910ec6 commit 2f2b126
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 12 deletions.
9 changes: 7 additions & 2 deletions src/CHIPDriver.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,8 @@ private:
bool DumpSpirv_ = false;
bool SkipUninit_ = false;
bool LazyJit_ = true;
std::string JitFlags_ = CHIP_DEFAULT_JIT_FLAGS;
std::string JitFlags_ = "";

Check warning on line 235 in src/CHIPDriver.hh

View workflow job for this annotation

GitHub Actions / cpp-linter

src/CHIPDriver.hh:235:15 [readability-identifier-naming] 

invalid case style for member 'JitFlags_'
std::string JitFlagsOverride_ = "";

Check warning on line 236 in src/CHIPDriver.hh

View workflow job for this annotation

GitHub Actions / cpp-linter

src/CHIPDriver.hh:236:15 [readability-identifier-naming] 

invalid case style for member 'JitFlagsOverride_'
unsigned long L0EventTimeout_ = 0;
int L0CollectEventsTimeout_ = 0;
bool OCLDisableQueueProfiling_ = false;
Expand All @@ -253,6 +254,8 @@ public:
bool getDumpSpirv() const { return DumpSpirv_; }
bool getSkipUninit() const { return SkipUninit_; }
const std::string &getJitFlags() const { return JitFlags_; }
const std::string &getJitFlagsOverride() const { return JitFlagsOverride_; }

Check warning on line 257 in src/CHIPDriver.hh

View workflow job for this annotation

GitHub Actions / cpp-linter

src/CHIPDriver.hh:257:3 [modernize-use-nodiscard] 

function 'getJitFlagsOverride' should be marked [[nodiscard]]

Check warning on line 257 in src/CHIPDriver.hh

View workflow job for this annotation

GitHub Actions / cpp-linter

src/CHIPDriver.hh:257:22 [modernize-use-trailing-return-type] 

use a trailing return type for this function
bool hasJitOverride() const { return !JitFlagsOverride_.empty(); }

Check warning on line 258 in src/CHIPDriver.hh

View workflow job for this annotation

GitHub Actions / cpp-linter

src/CHIPDriver.hh:258:3 [modernize-use-nodiscard] 

function 'hasJitOverride' should be marked [[nodiscard]]

Check warning on line 258 in src/CHIPDriver.hh

View workflow job for this annotation

GitHub Actions / cpp-linter

src/CHIPDriver.hh:258:8 [modernize-use-trailing-return-type] 

use a trailing return type for this function
bool getLazyJit() const { return LazyJit_; }

Check warning on line 259 in src/CHIPDriver.hh

View workflow job for this annotation

GitHub Actions / cpp-linter

src/CHIPDriver.hh:259:3 [modernize-use-nodiscard] 

function 'getLazyJit' should be marked [[nodiscard]]

Check warning on line 259 in src/CHIPDriver.hh

View workflow job for this annotation

GitHub Actions / cpp-linter

src/CHIPDriver.hh:259:8 [modernize-use-trailing-return-type] 

use a trailing return type for this function
int getL0CollectEventsTimeout() const { return L0CollectEventsTimeout_; }
unsigned long getL0EventTimeout() const {
Expand Down Expand Up @@ -288,6 +291,8 @@ private:
readEnvVar("CHIP_LAZY_JIT", value) ? parseBoolean(value) : LazyJit_;
JitFlags_ =
readEnvVar("CHIP_JIT_FLAGS", value, false) ? value : JitFlags_;
JitFlagsOverride_ =
readEnvVar("CHIP_JIT_FLAGS_OVERRIDE", value, false) ? value : JitFlagsOverride_;
L0CollectEventsTimeout_ =
readEnvVar("CHIP_L0_COLLECT_EVENTS_TIMEOUT", value)
? parseInt(value)
Expand Down Expand Up @@ -343,7 +348,7 @@ private:
logInfo("CHIP_DEVICE={}", DeviceIdx_);
logInfo("CHIP_BE={}", Backend_.str());
logInfo("CHIP_DUMP_SPIRV={}", DumpSpirv_ ? "on" : "off");
logInfo("CHIP_JIT_FLAGS={}", JitFlags_);
logInfo("CHIP_JIT_FLAGS_OVERRIDE={}", JitFlagsOverride_);
logInfo("CHIP_L0_COLLECT_EVENTS_TIMEOUT={}", L0CollectEventsTimeout_);
logInfo("CHIP_L0_EVENT_TIMEOUT={}", L0EventTimeout_);
logInfo("CHIP_SKIP_UNINIT={}", SkipUninit_ ? "on" : "off");
Expand Down
4 changes: 3 additions & 1 deletion src/backend/Level0/CHIPBackendLevel0.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2555,7 +2555,9 @@ void CHIPModuleLevel0::compile(chipstar::Device *ChipDev) {
std::vector<size_t> ILSizes(1, SPIRVBin.size());
std::vector<const uint8_t *> ILInputs(
1, reinterpret_cast<const uint8_t *>(SPIRVBin.data()));
auto Flags = ChipEnvVars.getJitFlags() + " " + Backend->getDefaultJitFlags();
auto Flags = ChipEnvVars.hasJitOverride() ? ChipEnvVars.getJitFlagsOverride()
: ChipEnvVars.getJitFlags() + " " +
Backend->getDefaultJitFlags();
logInfo("JIT flags: {}", Flags);
std::vector<const char *> BuildFlags(1, Flags.c_str());

Expand Down
22 changes: 16 additions & 6 deletions src/backend/OpenCL/CHIPBackendOpenCL.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -863,8 +863,9 @@ static cl::Program compileIL(cl::Context Ctx, CHIPDeviceOpenCL &ChipDev,

cl_device_id DevId = ChipDev.get()->get();
auto Start = std::chrono::high_resolution_clock::now();
auto Flags = Options + " " + Backend->getDefaultJitFlags() + " " +
ChipEnvVars.getJitFlags();
auto Flags = ChipEnvVars.hasJitOverride() ? ChipEnvVars.getJitFlagsOverride()
: ChipEnvVars.getJitFlags() + " " +
Backend->getDefaultJitFlags();
logInfo("JIT flags: {}", Flags);
Err = clCompileProgram(Prog.get(), 1, &DevId, Flags.c_str(), 0, nullptr,
nullptr, nullptr, nullptr);
Expand Down Expand Up @@ -1132,8 +1133,8 @@ void CHIPModuleOpenCL::compile(chipstar::Device *ChipDev) {

int Err;
auto SrcBin = Src_->getBinary();
std::string buildOptions = Backend->getDefaultJitFlags() + " " +
ChipEnvVars.getJitFlags();
std::string buildOptions =

Check warning on line 1136 in src/backend/OpenCL/CHIPBackendOpenCL.cc

View workflow job for this annotation

GitHub Actions / cpp-linter

src/backend/OpenCL/CHIPBackendOpenCL.cc:1136:15 [readability-identifier-naming] 

invalid case style for local variable 'buildOptions'
Backend->getDefaultJitFlags() + " " + ChipEnvVars.getJitFlags();
std::string binAsStr = std::string(SrcBin.begin(), SrcBin.end());

// Include device name in cache key
Expand All @@ -1154,9 +1155,18 @@ void CHIPModuleOpenCL::compile(chipstar::Device *ChipDev) {
appendRuntimeObjects(*ChipCtxOcl->get(), *ChipDevOcl, ClObjects);

auto linkStart = std::chrono::high_resolution_clock::now();
auto Flags = Backend->getDefaultJitFlags() + " " + ChipEnvVars.getJitFlags();

std::string Flags = "";
if (ChipEnvVars.getDeviceType() == DeviceType::GPU) {
// Only Intel GPU driver seems to need compile flags at the link step
Flags = ChipEnvVars.hasJitOverride() ? ChipEnvVars.getJitFlagsOverride()
: ChipEnvVars.getJitFlags() + " " +
Backend->getDefaultJitFlags();
}

logInfo("JIT Link flags: {}", Flags);
Program_ = cl::linkProgram(ClObjects, Flags.c_str(), nullptr, nullptr, &Err);
Program_ =
cl::linkProgram(ClObjects, Flags.c_str(), nullptr, nullptr, &Err);
auto linkEnd = std::chrono::high_resolution_clock::now();
auto linkDuration = std::chrono::duration_cast<std::chrono::microseconds>(
linkEnd - linkStart);
Expand Down
10 changes: 7 additions & 3 deletions tests/runtime/TestEnvVars.hip
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ void testEnvironmentVariableParsing() {
setEnvVar("CHIP_DUMP_SPIRV", "1");
setEnvVar("CHIP_SKIP_UNINIT", "on");
setEnvVar("CHIP_LAZY_JIT", "1");
setEnvVar("CHIP_JIT_FLAGS", "-O2");
setEnvVar("CHIP_JIT_FLAGS", "");
setEnvVar("CHIP_JIT_FLAGS_OVERRIDE", "");
setEnvVar("CHIP_L0_COLLECT_EVENTS_TIMEOUT", "1000");
setEnvVar("CHIP_L0_EVENT_TIMEOUT", "2000");
setEnvVar("CHIP_OCL_DISABLE_QUEUE_PROFILING", "1");
Expand All @@ -73,7 +74,8 @@ void testEnvironmentVariableParsing() {
assertEqual(true, envVars.getDumpSpirv(), "CHIP_DUMP_SPIRV");
assertEqual(true, envVars.getSkipUninit(), "CHIP_SKIP_UNINIT");
assertEqual(true, envVars.getLazyJit(), "CHIP_LAZY_JIT");
assertEqual(std::string("-O2"), envVars.getJitFlags(), "CHIP_JIT_FLAGS");
assertEqual(std::string(""), envVars.getJitFlags(), "CHIP_JIT_FLAGS");
assertEqual(std::string(""), envVars.getJitFlagsOverride(), "CHIP_JIT_FLAGS_OVERRIDE");
assertEqual(1000, envVars.getL0CollectEventsTimeout(), "CHIP_L0_COLLECT_EVENTS_TIMEOUT");
assertEqual(static_cast<unsigned long>(2000), envVars.getL0EventTimeout(), "CHIP_L0_EVENT_TIMEOUT");
assertEqual(true, envVars.getOCLDisableQueueProfiling(), "CHIP_OCL_DISABLE_QUEUE_PROFILING");
Expand All @@ -88,6 +90,7 @@ void testEnvironmentVariableParsing() {
unsetEnvVar("CHIP_SKIP_UNINIT");
unsetEnvVar("CHIP_LAZY_JIT");
unsetEnvVar("CHIP_JIT_FLAGS");
unsetEnvVar("CHIP_JIT_FLAGS_OVERRIDE");
unsetEnvVar("CHIP_L0_COLLECT_EVENTS_TIMEOUT");
unsetEnvVar("CHIP_L0_EVENT_TIMEOUT");
unsetEnvVar("CHIP_OCL_DISABLE_QUEUE_PROFILING");
Expand All @@ -108,7 +111,8 @@ void testDefaultValues() {
assertEqual(false, envVars.getDumpSpirv(), "Default CHIP_DUMP_SPIRV");
assertEqual(false, envVars.getSkipUninit(), "Default CHIP_SKIP_UNINIT");
assertEqual(true, envVars.getLazyJit(), "Default CHIP_LAZY_JIT");
assertEqual(std::string(CHIP_DEFAULT_JIT_FLAGS), envVars.getJitFlags(), "Default CHIP_JIT_FLAGS");
assertEqual(std::string(""), envVars.getJitFlags(), "Default CHIP_JIT_FLAGS");
assertEqual(std::string(""), envVars.getJitFlagsOverride(), "Default CHIP_JIT_FLAGS_OVERRIDE");
assertEqual(0, envVars.getL0CollectEventsTimeout(), "Default CHIP_L0_COLLECT_EVENTS_TIMEOUT");
assertEqual(UINT64_MAX, envVars.getL0EventTimeout(), "Default CHIP_L0_EVENT_TIMEOUT");
assertEqual(false, envVars.getOCLDisableQueueProfiling(), "Default CHIP_OCL_DISABLE_QUEUE_PROFILING");
Expand Down

0 comments on commit 2f2b126

Please sign in to comment.