Author: yaxunl Date: Thu Feb 28 09:08:26 2019 New Revision: 355106 URL: http://llvm.org/viewvc/llvm-project?rev=355106&view=rev Log: 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 Modified: cfe/trunk/lib/Driver/ToolChains/HIP.cpp cfe/trunk/test/Driver/hip-toolchain-features.hip Modified: cfe/trunk/lib/Driver/ToolChains/HIP.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains/HIP.cpp?rev=355106&r1=355105&r2=355106&view=diff ============================================================================== --- cfe/trunk/lib/Driver/ToolChains/HIP.cpp (original) +++ cfe/trunk/lib/Driver/ToolChains/HIP.cpp Thu Feb 28 09:08:26 2019 @@ -159,7 +159,7 @@ const char *AMDGCN::Linker::constructLlc 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::constructLlc 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)); Modified: cfe/trunk/test/Driver/hip-toolchain-features.hip URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/hip-toolchain-features.hip?rev=355106&r1=355105&r2=355106&view=diff ============================================================================== --- cfe/trunk/test/Driver/hip-toolchain-features.hip (original) +++ cfe/trunk/test/Driver/hip-toolchain-features.hip Thu Feb 28 09:08:26 2019 @@ -4,17 +4,6 @@ // 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 // RUN: %clang -### -c -target x86_64-linux-gnu -fgpu-rdc \ // RUN: -x hip --cuda-gpu-arch=gfx803 --cuda-gpu-arch=gfx900 %s \ @@ -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" _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
