AI/rocm-systems
2
0
Fork 0
Code Issues Pull-Requests Actions Pakete Projekte Releases Wiki Aktivität

P4 to Git Change 1358358 by wchau@wchau_OCL_boltzmann on 2017/01/04 10:21:31

Quellcode durchsuchen 
SWDEV-102698 - Back out changelist 1358063

Affected files ...

... //depot/stg/opencl/drivers/opencl/api/opencl/amdocl/build/Makefile.api#147 edit
... //depot/stg/opencl/drivers/opencl/compiler/tools/Makefile#21 edit
... //depot/stg/opencl/drivers/opencl/runtime/build/Makefile.runtime#66 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.cpp#206 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/device.hpp#281 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/build/Makefile.oclrocm#11 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/roccompiler.cpp#26 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.cpp#31 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocdevice.hpp#11 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.cpp#50 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocprogram.hpp#18 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocsettings.cpp#11 edit
... //depot/stg/opencl/drivers/opencl/runtime/device/rocm/rocsettings.hpp#5 edit
... //depot/stg/opencl/drivers/opencl/runtime/utils/flags.hpp#262 edit
Dieser Commit ist enthalten in:
foreman
2017-01-04 10:26:13 -05:00
Ursprung 99820356f1
Commit ff99f1f762
9 geänderte Dateien mit 26 neuen und 336 gelöschten Zeilen
Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen
rocclr/runtime/device/rocm/rocprogram.cpp
+12 -7
Datei anzeigen
@@ -531,8 +531,10 @@ HSAILProgram::linkImpl_LC(
}
std::vector<std::string> linkOptions;
if (!dev().cacheCompilation()->linkLLVMBitcode(C.get(), inputs, output, linkOptions, "")) {
buildLog_ += dev().cacheCompilation()->buildLog();
bool ret = C->LinkLLVMBitcode(inputs, output, linkOptions);
buildLog_ += C->Output();
if (!ret) {
buildLog_ += "Error: Linking bitcode failed: linking source & IR libraries.\n";
return false;
}
@@ -768,8 +770,10 @@ HSAILProgram::linkImpl_LC(amd::option::Options *options)
return false;
}
if (!dev().cacheCompilation()->linkLLVMBitcode(C.get(), inputs, linked_bc, linkOptions, "")) {
buildLog_ += dev().cacheCompilation()->buildLog();
bool ret = C->LinkLLVMBitcode(inputs, linked_bc, linkOptions);
buildLog_ += C->Output();
if (!ret) {
buildLog_ += "Error: Linking bitcode failed: linking source & IR libraries.\n";
return false;
}
@@ -808,9 +812,10 @@ HSAILProgram::linkImpl_LC(amd::option::Options *options)
std::istream_iterator<std::string> sit(strstr), end;
std::vector<std::string> params(sit, end);
if (!dev().cacheCompilation()->compileAndLinkExecutable(C.get(), inputs, out_exec, params,
codegenOptions)) {
buildLog_ += dev().cacheCompilation()->buildLog();
ret = C->CompileAndLinkExecutable(inputs, out_exec, params);
buildLog_ += C->Output();
if (!ret) {
buildLog_ += "Error: Creating the executable failed: Compiling LLVM IRs to exe.\n";
return false;
}