Revert changes in triple.

Author: mgcarrasco

clang/lib/Driver/Driver.cpp

@@ -995,7 +995,7 @@ inferOffloadToolchains(Compilation &C, Action::OffloadKind Kind) {
 
     StringRef Triple;
     if (ID == OffloadArch::AMDGCNSPIRV)
-      Triple = tools::AMDGCN::Linker::getSpirvBackendTriple();
+      Triple = "spirv64-amd-amdhsa";
     else if (IsNVIDIAOffloadArch(ID))
       Triple = C.getDefaultToolChain().getTriple().isArch64Bit()
                    ? "nvptx64-nvidia-cuda"

clang/lib/Driver/ToolChains/HIPAMD.cpp

@@ -183,7 +183,7 @@ void AMDGCN::Linker::constructLinkAndEmitSpirvCommand(
   if (UseSPIRVBackend) {
     llvm::opt::ArgStringList CmdArgs;
     const char *Triple =
-        C.getArgs().MakeArgString("-triple=" + getSpirvBackendTriple());
+        C.getArgs().MakeArgString("-triple=spirv64-amd-amdhsa");
     CmdArgs.append({"-cc1", Triple, "-emit-obj", LinkedBCFile.getFilename(),
                     "-o", Output.getFilename()});
     const char *Exec = getToolChain().getDriver().getClangProgramPath();

clang/lib/Driver/ToolChains/HIPAMD.h

@@ -34,10 +34,6 @@ class LLVM_LIBRARY_VISIBILITY Linker final : public Tool {
                     const llvm::opt::ArgList &TCArgs,
                     const char *LinkingOutput) const override;
 
-  static constexpr StringRef getSpirvBackendTriple() {
-    return "spirv64v1.6-amd-amdhsa";
-  }
-
 private:
   void constructLldCommand(Compilation &C, const JobAction &JA,
                            const InputInfoList &Inputs, const InputInfo &Output,

clang/test/Driver/amdgpu-spirv-backend-opt.c

@@ -2,7 +2,7 @@
 
 // COM: Test that -amdgpu-use-experimental-spirv-backend calls clang -cc1 with the SPIRV triple.
 // RUN: %clang -x hip %s --cuda-device-only --offload-arch=amdgcnspirv -amdgpu-use-experimental-spirv-backend -nogpuinc -nogpulib -### 2>&1 | FileCheck %s --check-prefix=CHECK-SPIRV-BACKEND
-// CHECK-SPIRV-BACKEND: "{{.*}}clang{{.*}}" "-cc1" "{{.*-triple=spirv64v[0-9]+\.[0-9]+-amd-amdhsa}}"
+// CHECK-SPIRV-BACKEND: "{{.*}}clang{{.*}}" "-cc1" "{{.*-triple=spirv64-amd-amdhsa}}"
 
 // COM: Test that -no-amdgpu-use-experimental-spirv-backend calls the SPIRV translator
 // RUN: %clang -x hip %s --cuda-device-only --offload-arch=amdgcnspirv -no-amdgpu-use-experimental-spirv-backend -nogpuinc -nogpulib -### 2>&1 | FileCheck %s --check-prefix=CHECK-SPIRV-TRANSLATOR

clang/test/Driver/hip-phases.hip

@@ -700,6 +700,6 @@
 // SPIRV-ONLY-NEXT: 9: compiler, {8}, ir, (device-hip, amdgcnspirv)
 // SPIRV-ONLY-NEXT: 10: backend, {9}, ir, (device-hip, amdgcnspirv)
 // SPIRV-ONLY-NEXT: 11: linker, {10}, image, (device-hip, amdgcnspirv)
-// SPIRV-ONLY-NEXT: 12: offload, "device-hip (spirv64v1.6-amd-amdhsa:amdgcnspirv)" {11}, image
+// SPIRV-ONLY-NEXT: 12: offload, "device-hip (spirv64-amd-amdhsa:amdgcnspirv)" {11}, image
 // SPIRV-ONLY-NEXT: 13: linker, {6, 12}, hip-fatbin, (device-hip)
 // SPIRV-ONLY-NEXT: 14: offload, "device-hip (amdgcn-amd-amdhsa)" {13}, none