AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

P4 to Git Change 1305360 by lmoriche@lmoriche_opencl_dev on 2016/08/21 17:34:39

Browse Source 
SWDEV-94640 - Set the O# level and cl-std from the command args or default settings.
	Select the correct header (CL1.2/C2.0) from the given cl-std.
	Reorder the linked libraries in reverse order of dependency (was failing linking).
	Make the built-in library objects depend on the pre-compiled header.
	Disable the timestamp on the pre-compiled header.
	Disable image support reporting.

Affected files ...

... //depot/stg/opencl/drivers/opencl/make/amdgcn.git/headers/build/Makefile.headers#7 edit
... //depot/stg/opencl/drivers/opencl/make/amdgcn.git/irif/build/Makefile.irif#4 edit
... //depot/stg/opencl/drivers/opencl/make/amdgcn.git/ockl/build/Makefile.ockl#5 edit
... //depot/stg/opencl/drivers/opencl/make/amdgcn.git/oclc/build/Makefile.oclc#5 edit
... //depot/stg/opencl/drivers/opencl/make/amdgcn.git/ocml/build/Makefile.ocml#5 edit
... //depot/stg/opencl/drivers/opencl/make/amdgcn.git/opencl/build/Makefile.opencl#6 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/roccompiler.cpp#8 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#10 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.cpp#11 edit
This commit is contained in:
foreman
2016-08-21 17:46:14 -04:00
parent e2c43f9651
commit 9674e8eb01
3 changed files with 61 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rocclr/runtime/device/rocm/rocprogram.cpp
+7 -3
View File
@@ -638,10 +638,10 @@ namespace roc {
return false;
}
inputs.push_back(irif_bc);
inputs.push_back(ocml_bc); // depends on irif
inputs.push_back(ockl_bc); // depends on irif
inputs.push_back(opencl_bc); // depends on oclm & ockl
inputs.push_back(ockl_bc); // depends on irif
inputs.push_back(ocml_bc); // depends on irif
inputs.push_back(irif_bc);
// open the control functions
std::pair<const void*, size_t> isa_version;
@@ -734,6 +734,10 @@ namespace roc {
optionsstr.append(" -mcpu=");
optionsstr.append(dev().deviceInfo().machineTarget_);
std::ostringstream optLevel;
optLevel << " -O" << options->oVariables->OptLevel;
optionsstr.append(optLevel.str());
// Tokenize the options string into a vector of strings
std::istringstream strstr(optionsstr);
std::istream_iterator<std::string> sit(strstr), end;