update tests

Author: jhuber6

clang/test/Driver/hip-code-object-version.hip

@@ -69,11 +69,4 @@
 // RUN:   %s 2>&1 | FileCheck -check-prefix=CC1 %s
 
 // CC1: "-cc1" {{.*}}"-mcode-object-version=5" {{.*}}"-mllvm" "--amdhsa-code-object-version=5"
-// CC1: "-cc1as" {{.*}}"-mllvm" "--amdhsa-code-object-version=5"
-
-// RUN: not %clang -### --target=x86_64-linux-gnu \
-// RUN:   -mcode-object-version=5 \
-// RUN:   --offload-arch=gfx906 --rocm-path=%S/Inputs/rocm -save-temps \
-// RUN:   %s 2>&1 | FileCheck -check-prefix=CC1NEG %s
-
-// CC1NEG-NOT: "-cc1as" {{.*}}"-mcode-object-version=5"
+// CC1: clang-linker-wrapper{{.*}}"--device-compiler=amdgcn-amd-amdhsa=-mcode-object-version=5"

clang/test/Driver/hip-options.hip

@@ -22,15 +22,13 @@
 // RUN: %clang -### -nogpulib -nogpuinc --target=x86_64-unknown-linux-gnu -mprintf-kind=hostcall  %s -save-temps 2>&1 | FileCheck -check-prefix=HOSTC %s
 // HOSTC: "-cc1" "-triple" "amdgcn-amd-amdhsa"{{.*}}"-mprintf-kind=hostcall" "-Werror=format-invalid-specifier"{{.*}}"-E" {{.*}}
 // HOSTC: "-cc1" "-triple" "amdgcn-amd-amdhsa"{{.*}} "-mprintf-kind=hostcall" "-Werror=format-invalid-specifier" {{.*}}"-x" "hip-cpp-output"
-// HOSTC: "-cc1" "-triple" "amdgcn-amd-amdhsa"{{.*}} "-mprintf-kind=hostcall" "-Werror=format-invalid-specifier" {{.*}}"-x" "ir"
 // HOSTC: "-cc1" "-triple" "x86_64-unknown-linux-gnu"{{.*}} "-E" {{.*}}
 // HOSTC: "-cc1" "-triple" "x86_64-unknown-linux-gnu"{{.*}}"-x" "ir"
 
 // Check -mprintf-kind=buffered
 // RUN: %clang -### -nogpulib -nogpuinc --target=x86_64-unknown-linux-gnu -mprintf-kind=buffered  %s -save-temps 2>&1 | FileCheck -check-prefix=BUFF %s
 // BUFF: "-cc1" "-triple" "amdgcn-amd-amdhsa"{{.*}}"-mprintf-kind=buffered" "-Werror=format-invalid-specifier"{{.*}}"-E" {{.*}}
 // BUFF: "-cc1" "-triple" "amdgcn-amd-amdhsa"{{.*}} "-mprintf-kind=buffered" "-Werror=format-invalid-specifier" {{.*}}"-x" "hip-cpp-output"
-// BUFF: "-cc1" "-triple" "amdgcn-amd-amdhsa"{{.*}} "-mprintf-kind=buffered" "-Werror=format-invalid-specifier" {{.*}}"-x" "ir"
 // BUFF: "-cc1" "-triple" "x86_64-unknown-linux-gnu"{{.*}} "-E" {{.*}}
 // BUFF: "-cc1" "-triple" "x86_64-unknown-linux-gnu"{{.*}}"-x" "ir"
 

clang/test/Driver/hip-sanitize-options.hip

@@ -57,13 +57,11 @@
 // CHECK-NOT: {{"[^"]*lld(\.exe){0,1}".* ".*hip.bc"}}
 // CHECK: {{"[^"]*clang[^"]*".* "-triple" "x86_64-unknown-linux-gnu".* "-fsanitize=address"}}
 
-// NORDC: {{"[^"]*clang[^"]*".* "-emit-obj".* "-fcuda-is-device".* .* "-mlink-bitcode-file" ".*asanrtl.bc".* "-fsanitize=address".*}} "-o" "[[OUT:[^"]*.o]]"
-// NORDC-NOT: {{"[^"]*lld(\.exe){0,1}".*}} "[[OUT]]" {{".*asanrtl.bc" ".*hip.bc"}}
+// NORDC: {{"[^"]*clang[^"]*".* "-emit-llvm-bc".* "-fcuda-is-device".* .* "-mlink-bitcode-file" ".*asanrtl.bc".* "-fsanitize=address".*}} "-o" "[[OUT:[^"]*.bc]]"
 // NORDC: {{"[^"]*clang[^"]*".* "-triple" "x86_64-unknown-linux-gnu".* "-fsanitize=address"}}
 
 // RDC: {{"[^"]*clang[^"]*".* "-emit-llvm-bc".* "-fcuda-is-device".* "-mlink-bitcode-file" ".*asanrtl.bc".* "-fsanitize=address".*}} "-o" "[[OUT:[^"]*.bc]]"
 // RDC: {{"[^"]*clang[^"]*".* "-triple" "x86_64-unknown-linux-gnu".* "-fsanitize=address"}}
-// RDC-NOT: {{"[^"]*lld(\.exe){0,1}".*}} "[[OUT]]" {{".*asanrtl.bc" ".*hip.bc"}}
 
 // FAIL: error: cannot find ROCm device library for ABI version 5; provide its path via '--rocm-path' or '--rocm-device-lib-path', or pass '-nogpulib' to build without ROCm device library
 

clang/test/Driver/hip-toolchain-opt.hip

@@ -74,6 +74,17 @@
 // O0-CGO2-SAME: "-O0"
 // O0-CGO2-NOT: "--lto-CGO2"
 
+// ALL: "{{.*}}clang-linker-wrapper{{.*}}" "--should-extract=gfx900"
+// DEFAULT-NOT: "--device-compiler=amdgcn-amd-amdhsa=-O{{.*}}"
+// O0-SAME: "--device-compiler=amdgcn-amd-amdhsa=-O0"
+// O1-SAME: "--device-compiler=amdgcn-amd-amdhsa=-O1"
+// O2-SAME: "--device-compiler=amdgcn-amd-amdhsa=-O2"
+// O3-SAME: "--device-compiler=amdgcn-amd-amdhsa=-O3"
+// Os-SAME: "--device-compiler=amdgcn-amd-amdhsa=-Os"
+// Oz-SAME: "--device-compiler=amdgcn-amd-amdhsa=-Oz"
+// Og-SAME: "--device-compiler=amdgcn-amd-amdhsa=-Og"
+// O0-CGO2-SAME: "--device-compiler=amdgcn-amd-amdhsa=-O0"
+
 // ALL: "-cc1" "-triple" "x86_64-unknown-linux-gnu"
 // DEFAULT-NOT: "-O{{.}}"
 // O0-SAME: "-O0"
@@ -85,14 +96,3 @@
 // Og-SAME: "-Og"
 // O0-CGO2-SAME: "-O0"
 // O0-CGO2-NOT: "--lto-CGO2"
-
-// ALL: "{{.*}}clang-linker-wrapper{{.*}}" "--should-extract=gfx900"
-// DEFAULT-NOT: "--device-compiler=amdgcn-amd-amdhsa=-O{{.*}}"
-// O0-SAME: "--device-compiler=amdgcn-amd-amdhsa=-O0"
-// O1-SAME: "--device-compiler=amdgcn-amd-amdhsa=-O1"
-// O2-SAME: "--device-compiler=amdgcn-amd-amdhsa=-O2"
-// O3-SAME: "--device-compiler=amdgcn-amd-amdhsa=-O3"
-// Os-SAME: "--device-compiler=amdgcn-amd-amdhsa=-Os"
-// Oz-SAME: "--device-compiler=amdgcn-amd-amdhsa=-Oz"
-// Og-SAME: "--device-compiler=amdgcn-amd-amdhsa=-Og"
-// O0-CGO2-SAME: "--device-compiler=amdgcn-amd-amdhsa=-O0"

clang/test/Driver/no-gpu-bundle-respected.hip

@@ -10,8 +10,8 @@
 // RUN:   --no-gpu-bundle-output --offload-arch=gfx900,gfx1030 -O3 -x hip %s \
 // RUN:   2>&1 | FileCheck %s --check-prefixes=COMPILER,GFX1030,GFX900,OFFLOAD,NOBUNDLE
 
-// BUNDLE: clang-offload-bundler
-// NOBUNDLE-NOT: clang-offload-bundler
+// BUNDLE: llvm-offload-binary
+// NOBUNDLE-NOT: llvm-offload-binary
 
 // COM: sanity checks
 // COMPILER: compiler