|
80 | 80 | #include "llvm/Support/MemoryBuffer.h"
|
81 | 81 | #include "llvm/Support/Path.h"
|
82 | 82 | #include "llvm/Support/Signals.h"
|
83 |
| -#include "llvm/Support/WithColor.h" |
84 | 83 | #include "llvm/Support/VirtualFileSystem.h"
|
| 84 | +#include "llvm/Support/WithColor.h" |
85 | 85 | #include "llvm/TargetParser/Host.h"
|
86 | 86 |
|
87 | 87 | #ifndef COMGR_DISABLE_SPIRV
|
@@ -992,8 +992,9 @@ AMDGPUCompiler::addTargetIdentifierFlags(llvm::StringRef IdentStr,
|
992 | 992 | } else {
|
993 | 993 | // Triple and CPU
|
994 | 994 | Args.push_back("-target");
|
995 |
| - Args.push_back(Saver.save(Twine(Ident.Arch) + "-" + Ident.Vendor + "-" + |
996 |
| - Ident.OS).data()); |
| 995 | + Args.push_back( |
| 996 | + Saver.save(Twine(Ident.Arch) + "-" + Ident.Vendor + "-" + Ident.OS) |
| 997 | + .data()); |
997 | 998 | Args.push_back(Saver.save(Twine("-mcpu=") + GPUArch).data());
|
998 | 999 | }
|
999 | 1000 |
|
@@ -1866,8 +1867,8 @@ amd_comgr_status_t AMDGPUCompiler::linkToExecutable() {
|
1866 | 1867 | amd_comgr_status_t AMDGPUCompiler::translateSpirvToBitcode() {
|
1867 | 1868 | #ifdef COMGR_DISABLE_SPIRV
|
1868 | 1869 | LogS << "Calling AMDGPUCompiler::translateSpirvToBitcode() not supported "
|
1869 |
| - << "Comgr is built with -DCOMGR_DISABLE_SPIRV. Re-build LLVM and Comgr " |
1870 |
| - << "with LLVM-SPIRV-Translator support to continue.\n"; |
| 1870 | + << "Comgr is built with -DCOMGR_DISABLE_SPIRV. Re-build LLVM and Comgr " |
| 1871 | + << "with LLVM-SPIRV-Translator support to continue.\n"; |
1871 | 1872 | return AMD_COMGR_STATUS_ERROR;
|
1872 | 1873 | #else
|
1873 | 1874 | if (auto Status = createTmpDirs()) {
|
@@ -1930,8 +1931,8 @@ amd_comgr_status_t AMDGPUCompiler::translateSpirvToBitcode() {
|
1930 | 1931 | }
|
1931 | 1932 |
|
1932 | 1933 | LogS << "SPIR-V Translation: amd-llvm-spirv -r --spirv-target-env=CL2.0 "
|
1933 |
| - << getFilePath(Input, InputDir) << " " |
1934 |
| - << getFilePath(Output, OutputDir) << " (command line equivalent)\n"; |
| 1934 | + << getFilePath(Input, InputDir) << " " |
| 1935 | + << getFilePath(Output, OutputDir) << " (command line equivalent)\n"; |
1935 | 1936 |
|
1936 | 1937 | if (env::shouldSaveTemps()) {
|
1937 | 1938 | if (auto Status = outputToFile(Output, getFilePath(Output, OutputDir))) {
|
|
0 commit comments