maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Partial revert of r353952: [HIP] Handle compile -m options and propagate into LLC 

Remove comments and tests about passing -mcode-object-v3 to driver since it does
not work. Other -m options are OK.

Also put back -mattr=-code-object-v3 since HIP is still not ready for code object
v3.

Differential Revision: https://reviews.llvm.org/D57977

llvm-svn: 355106
This commit is contained in:
Yaxun Liu 2019-02-28 17:08:26 +00:00
parent 586187639a
commit fd2c5c05fc
2 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang/lib/Driver/ToolChains/HIP.cpp
View File

@ -159,7 +159,7 @@ const char *AMDGCN::Linker::constructLlcCommand(
llvm::StringRef OutputFilePrefix, const char *InputFileName) const {
// Construct llc command.
ArgStringList LlcArgs{InputFileName, "-mtriple=amdgcn-amd-amdhsa",
"-filetype=obj",
"-filetype=obj", "-mattr=-code-object-v3",
Args.MakeArgString("-mcpu=" + SubArchName)};
// Extract all the -m options
@ -167,7 +167,7 @@ const char *AMDGCN::Linker::constructLlcCommand(
handleTargetFeaturesGroup(
Args, Features, options::OPT_m_amdgpu_Features_Group);
// Add features to mattr such as code-object-v3 and xnack
// Add features to mattr such as xnack
std::string MAttrString = "-mattr=";
for(auto OneFeature : Features) {
MAttrString.append(Args.MakeArgString(OneFeature));

19
clang/test/Driver/hip-toolchain-features.hip
View File

@ -2,17 +2,6 @@
// REQUIRES: x86-registered-target
// REQUIRES: amdgpu-registered-target
// RUN: %clang -### -c -target x86_64-linux-gnu -fgpu-rdc \
// RUN: -x hip --cuda-gpu-arch=gfx803 --cuda-gpu-arch=gfx900 %s \
// RUN: -mcode-object-v3 2>&1 | FileCheck %s -check-prefix=COV3
// RUN: %clang -### -c -target x86_64-linux-gnu -fgpu-rdc \
// RUN: -x hip --cuda-gpu-arch=gfx803 --cuda-gpu-arch=gfx900 %s \
// RUN: -mno-code-object-v3 2>&1 | FileCheck %s -check-prefix=NOCOV3
// COV3: {{.*}}clang{{.*}}"-target-feature" "+code-object-v3"
// NOCOV3: {{.*}}clang{{.*}}"-target-feature" "-code-object-v3"
// RUN: %clang -### -c -target x86_64-linux-gnu -fgpu-rdc \
// RUN: -x hip --cuda-gpu-arch=gfx803 --cuda-gpu-arch=gfx900 %s \
// RUN: -mxnack 2>&1 | FileCheck %s -check-prefix=XNACK
@ -37,12 +26,12 @@
// RUN: %clang -### -c -target x86_64-linux-gnu -fgpu-rdc \
// RUN: -x hip --cuda-gpu-arch=gfx803 --cuda-gpu-arch=gfx900 %s \
// RUN: -mcode-object-v3 -mxnack -msram-ecc \
// RUN: -mxnack -msram-ecc \
// RUN: 2>&1 | FileCheck %s -check-prefix=ALL3
// RUN: %clang -### -c -target x86_64-linux-gnu -fgpu-rdc \
// RUN: -x hip --cuda-gpu-arch=gfx803 --cuda-gpu-arch=gfx900 %s \
// RUN: -mno-code-object-v3 -mno-xnack -mno-sram-ecc \
// RUN: -mno-xnack -mno-sram-ecc \
// RUN: 2>&1 | FileCheck %s -check-prefix=NOALL3
// ALL3: {{.*}}clang{{.*}}"-target-feature" "+code-object-v3" "-target-feature" "+xnack" "-target-feature" "+sram-ecc"
// NOALL3: {{.*}}clang{{.*}}"-target-feature" "-code-object-v3" "-target-feature" "-xnack" "-target-feature" "-sram-ecc"
// ALL3: {{.*}}clang{{.*}}"-target-feature" "+xnack" "-target-feature" "+sram-ecc"
// NOALL3: {{.*}}clang{{.*}}"-target-feature" "-xnack" "-target-feature" "-sram-ecc"