[llvm-branch-commits] [clang] clang/AMDGPU: Migrate OpenMP cc1 tests to amdgpu triples (12) (PR #212051)

Matt Arsenault via llvm-branch-commits Sat, 25 Jul 2026 12:30:42 -0700

https://github.com/arsenm created 
https://github.com/llvm/llvm-project/pull/212051


Migrate the OpenMP offload cc1 tests to the new amdgpu triple scheme:

  * -fopenmp-targets=amdgcn-amd-amdhsa -> -fopenmp-targets=amdgpu-amd-amdhsa
    (the offload toolchain triple, the generic amdgpu arch).
  * The device -triple amdgcn-amd-amdhsa -> amdgpu-amd-amdhsa, or to the
    specific subarch triple (dropping -target-cpu) where a -target-cpu was
    present.

Autogenerated CHECK lines are regenerated, and the few -Wopenmp-target-
exception diagnostics that embed the triple string are updated. Tests that
intentionally assert the "target-cpu" function attribute are left unchanged.

Co-authored-by: Claude (Opus 4.8) <[email protected]>

>From 4cbc68c0d2d51c26bd3b9f3bd008e0ed85160111 Mon Sep 17 00:00:00 2001
From: Matt Arsenault <[email protected]>
Date: Wed, 24 Jun 2026 15:14:37 +0200
Subject: [PATCH] clang/AMDGPU: Migrate OpenMP cc1 tests to amdgpu triples (12)

Migrate the OpenMP offload cc1 tests to the new amdgpu triple scheme:

  * -fopenmp-targets=amdgcn-amd-amdhsa -> -fopenmp-targets=amdgpu-amd-amdhsa
    (the offload toolchain triple, the generic amdgpu arch).
  * The device -triple amdgcn-amd-amdhsa -> amdgpu-amd-amdhsa, or to the
    specific subarch triple (dropping -target-cpu) where a -target-cpu was
    present.

Autogenerated CHECK lines are regenerated, and the few -Wopenmp-target-
exception diagnostics that embed the triple string are updated. Tests that
intentionally assert the "target-cpu" function attribute are left unchanged.

Co-authored-by: Claude (Opus 4.8) <[email protected]>
---
 clang/test/OpenMP/amdgcn-attributes.cpp       | 10 ++--
 clang/test/OpenMP/amdgcn_debug_nowait.c       |  2 +-
 .../OpenMP/amdgcn_device_function_call.cpp    |  4 +-
 clang/test/OpenMP/amdgcn_ldbl_check.cpp       |  2 +-
 clang/test/OpenMP/amdgcn_save_temps.c         |  6 +--
 clang/test/OpenMP/amdgcn_sret_ctor.cpp        |  2 +-
 clang/test/OpenMP/amdgcn_target_codegen.cpp   |  4 +-
 .../test/OpenMP/amdgcn_target_device_vla.cpp  |  4 +-
 .../amdgcn_target_global_constructor.cpp      |  4 +-
 .../OpenMP/amdgcn_target_init_temp_alloca.cpp |  4 +-
 clang/test/OpenMP/amdgcn_weak_alias.c         |  6 +--
 clang/test/OpenMP/amdgcn_weak_alias.cpp       |  6 +--
 .../test/OpenMP/amdgpu-unsafe-fp-atomics.cpp  | 16 +++----
 clang/test/OpenMP/amdgpu_exceptions.cpp       | 22 ++++-----
 .../amdgpu_target_with_aligned_attribute.c    |  4 +-
 clang/test/OpenMP/amdgpu_throw.cpp            | 20 ++++----
 clang/test/OpenMP/amdgpu_throw_trap.cpp       |  2 +-
 clang/test/OpenMP/amdgpu_try_catch.cpp        | 20 ++++----
 clang/test/OpenMP/copy-gaps-1.cpp             |  2 +-
 clang/test/OpenMP/copy-gaps-2.cpp             |  2 +-
 clang/test/OpenMP/copy-gaps-3.cpp             |  2 +-
 clang/test/OpenMP/copy-gaps-4.cpp             |  2 +-
 clang/test/OpenMP/copy-gaps-5.cpp             |  2 +-
 clang/test/OpenMP/copy-gaps-6.cpp             |  2 +-
 clang/test/OpenMP/debug-info-kmpc.cpp         |  4 +-
 .../OpenMP/declare_target_local_codegen.cpp   | 10 ++--
 .../declare_target_local_map_messages.cpp     |  2 +-
 .../declare_target_local_usm_codegen.cpp      |  6 +--
 ...declare_target_nohost_variant_messages.cpp |  2 +-
 .../declare_variant_construct_codegen_1.c     | 48 +++++++++----------
 clang/test/OpenMP/force-usm.c                 |  8 ++--
 clang/test/OpenMP/interop_codegen.cpp         |  2 +-
 clang/test/OpenMP/metadirective_ast_print.c   |  8 ++--
 .../metadirective_device_arch_codegen.cpp     |  4 +-
 ...etadirective_device_isa_codegen_amdgcn.cpp |  4 +-
 clang/test/OpenMP/ompx_attributes_codegen.cpp |  8 ++--
 .../strided_update_variable_stride_codegen.c  |  6 +--
 .../OpenMP/target_data_if_logical_codegen.cpp |  6 +--
 .../OpenMP/target_exceptions_messages.cpp     |  6 +--
 clang/test/OpenMP/target_indirect_codegen.cpp | 10 ++--
 ...arget_num_teams_num_threads_attributes.cpp |  6 +--
 .../target_parallel_generic_loop_codegen.cpp  |  4 +-
 .../OpenMP/target_parallel_no_exceptions.cpp  |  2 +-
 ...t_parallel_num_threads_strict_messages.cpp | 12 ++---
 .../OpenMP/target_team_variable_codegen.cpp   |  4 +-
 .../target_teams_generic_loop_codegen.cpp     |  4 +-
 ...ams_generic_loop_codegen_as_distribute.cpp |  4 +-
 ...s_generic_loop_codegen_as_parallel_for.cpp |  8 ++--
 .../target_update_count_expression_codegen.c  |  6 +--
 clang/test/OpenMP/target_visibility.cpp       |  2 +-
 clang/test/OpenMP/thread_limit_gpu.c          |  6 +--
 clang/test/SemaOpenMP/amdgpu-barrier.cpp      |  2 +-
 clang/test/SemaOpenMP/amdgpu-buffer-rsrc.cpp  |  2 +-
 clang/test/SemaOpenMP/amdgpu-image-rsrc.cpp   |  2 +-
 54 files changed, 173 insertions(+), 175 deletions(-)

diff --git a/clang/test/OpenMP/amdgcn-attributes.cpp 
b/clang/test/OpenMP/amdgcn-attributes.cpp
index 9f4900cc09c1f..789c8d6d72218 100644
--- a/clang/test/OpenMP/amdgcn-attributes.cpp
+++ b/clang/test/OpenMP/amdgcn-attributes.cpp
@@ -1,10 +1,10 @@
 // REQUIRES: amdgpu-registered-target
 
-// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm-bc %s -o %t-ppc-host.bc
-// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple amdgcn-amd-amdhsa 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck 
-check-prefixes=DEFAULT,ALL %s
-// RUN: %clang_cc1 -target-cpu gfx900 -fopenmp -x c++ -std=c++11 -triple 
amdgcn-amd-amdhsa -fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s 
-fopenmp-is-target-device -fopenmp-host-ir-file-path %t-ppc-host.bc -o - | 
FileCheck -check-prefixes=CPU,ALL %s
+// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm-bc %s -o %t-ppc-host.bc
+// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple amdgpu-amd-amdhsa 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck 
-check-prefixes=DEFAULT,ALL %s
+// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple amdgpu9.00-amd-amdhsa 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck 
-check-prefixes=DEFAULT,ALL %s
 
-// RUN: %clang_cc1 -menable-no-nans -mno-amdgpu-ieee -fopenmp -x c++ 
-std=c++11 -triple amdgcn-amd-amdhsa -fopenmp-targets=amdgcn-amd-amdhsa 
-emit-llvm %s -fopenmp-is-target-device -fopenmp-host-ir-file-path 
%t-ppc-host.bc -o - | FileCheck -check-prefixes=NOIEEE,ALL %s
+// RUN: %clang_cc1 -menable-no-nans -mno-amdgpu-ieee -fopenmp -x c++ 
-std=c++11 -triple amdgpu-amd-amdhsa -fopenmp-targets=amdgpu-amd-amdhsa 
-emit-llvm %s -fopenmp-is-target-device -fopenmp-host-ir-file-path 
%t-ppc-host.bc -o - | FileCheck -check-prefixes=NOIEEE,ALL %s
 
 // expected-no-diagnostics
 
@@ -32,9 +32,7 @@ int callable(int x) {
 }
 
 // DEFAULT: attributes #0 = { convergent mustprogress noinline norecurse 
nounwind optnone "amdgpu-flat-work-group-size"="1,42" "kernel" 
"no-trapping-math"="true" "omp_target_thread_limit"="42" 
"stack-protector-buffer-size"="8" "uniform-work-group-size" }
-// CPU: attributes #0 = { convergent mustprogress noinline norecurse nounwind 
optnone "amdgpu-flat-work-group-size"="1,42" "kernel" "no-trapping-math"="true" 
"omp_target_thread_limit"="42" "stack-protector-buffer-size"="8" 
"target-cpu"="gfx900" "uniform-work-group-size" }
 // NOIEEE: attributes #0 = { convergent mustprogress noinline norecurse 
nounwind optnone "amdgpu-flat-work-group-size"="1,42" "amdgpu-ieee"="false" 
"kernel" "no-trapping-math"="true" "omp_target_thread_limit"="42" 
"stack-protector-buffer-size"="8" "uniform-work-group-size" }
 
 // DEFAULT: attributes #2 = { convergent mustprogress noinline nounwind 
optnone "no-trapping-math"="true" "stack-protector-buffer-size"="8" }
-// CPU: attributes #2 = { convergent mustprogress noinline nounwind optnone 
"no-trapping-math"="true" "stack-protector-buffer-size"="8" 
"target-cpu"="gfx900" }
 // NOIEEE: attributes #2 = { convergent mustprogress noinline nounwind optnone 
"amdgpu-ieee"="false" "no-trapping-math"="true" 
"stack-protector-buffer-size"="8" }
diff --git a/clang/test/OpenMP/amdgcn_debug_nowait.c 
b/clang/test/OpenMP/amdgcn_debug_nowait.c
index d691327512ff7..5831a9438563a 100644
--- a/clang/test/OpenMP/amdgcn_debug_nowait.c
+++ b/clang/test/OpenMP/amdgcn_debug_nowait.c
@@ -1,6 +1,6 @@
 // REQUIRES: amdgpu-registered-target
 
-// RUN: %clang_cc1 -debug-info-kind=line-tables-only -fopenmp -triple 
x86_64-unknown-unknown -fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm-bc %s -o 
%t-host.bc
+// RUN: %clang_cc1 -debug-info-kind=line-tables-only -fopenmp -triple 
x86_64-unknown-unknown -fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm-bc %s -o 
%t-host.bc
 
 int test() {
   int c;
diff --git a/clang/test/OpenMP/amdgcn_device_function_call.cpp 
b/clang/test/OpenMP/amdgcn_device_function_call.cpp
index e9cedc6fc7794..77e9f50c19c16 100644
--- a/clang/test/OpenMP/amdgcn_device_function_call.cpp
+++ b/clang/test/OpenMP/amdgcn_device_function_call.cpp
@@ -1,7 +1,7 @@
 // REQUIRES: amdgpu-registered-target
 
-// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm-bc %s -o %t-ppc-host.bc
-// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple amdgcn-amd-amdhsa 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck %s
+// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm-bc %s -o %t-ppc-host.bc
+// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple amdgpu-amd-amdhsa 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck %s
 // RUN: llvm-dis < %t-ppc-host.bc | FileCheck %s -check-prefix=HOST
 
 // device side declarations
diff --git a/clang/test/OpenMP/amdgcn_ldbl_check.cpp 
b/clang/test/OpenMP/amdgcn_ldbl_check.cpp
index 17882b3074e72..034d2c34aa3ba 100644
--- a/clang/test/OpenMP/amdgcn_ldbl_check.cpp
+++ b/clang/test/OpenMP/amdgcn_ldbl_check.cpp
@@ -1,6 +1,6 @@
 // REQUIRES: amdgpu-registered-target
 
-// RUN: %clang_cc1 -triple x86_64-mingw64 -emit-llvm-bc -target-cpu x86-64 
-fopenmp -fopenmp-targets=amdgcn-amd-amdhsa -o %t.bc -x c++ %s
+// RUN: %clang_cc1 -triple x86_64-mingw64 -emit-llvm-bc -target-cpu x86-64 
-fopenmp -fopenmp-targets=amdgpu-amd-amdhsa -o %t.bc -x c++ %s
 // RUN: %clang_cc1 -triple amdgpu9.00-amd-amdhsa -aux-triple x86_64-mingw64 
-fsyntax-only -fopenmp -fopenmp-is-target-device -fopenmp-host-ir-file-path 
%t.bc -x c++ %s
 // expected-no-diagnostics
 
diff --git a/clang/test/OpenMP/amdgcn_save_temps.c 
b/clang/test/OpenMP/amdgcn_save_temps.c
index d838bb1166b6b..32ef81a034c3a 100644
--- a/clang/test/OpenMP/amdgcn_save_temps.c
+++ b/clang/test/OpenMP/amdgcn_save_temps.c
@@ -1,9 +1,9 @@
 
 // REQUIRES: amdgpu-registered-target
 
-// RUN: %clang_cc1 -E -fopenmp -x c -triple amdgcn-amd-amdhsa 
-fopenmp-targets=amdgcn-amd-amdhsa -save-temps=cwd %s -o 
%t-openmp-amdgcn-amd-amdhsa-gfx90a.i
-// RUN: %clang_cc1 -fopenmp  -x c -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgcn-amd-amdhsa -save-temps=cwd -emit-llvm-bc %s -o 
%t-x86_64-unknown-unknown.bc
-// RUN: %clang_cc1 -fopenmp -x c -triple amdgcn-amd-amdhsa 
-fopenmp-targets=amdgcn-amd-amdhsa -save-temps=cwd -emit-llvm 
-fopenmp-is-target-device -x cpp-output %t-openmp-amdgcn-amd-amdhsa-gfx90a.i 
-fopenmp-host-ir-file-path %t-x86_64-unknown-unknown.bc -o - | FileCheck %s
+// RUN: %clang_cc1 -E -fopenmp -x c -triple amdgpu-amd-amdhsa 
-fopenmp-targets=amdgpu-amd-amdhsa -save-temps=cwd %s -o 
%t-openmp-amdgcn-amd-amdhsa-gfx90a.i
+// RUN: %clang_cc1 -fopenmp  -x c -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgpu-amd-amdhsa -save-temps=cwd -emit-llvm-bc %s -o 
%t-x86_64-unknown-unknown.bc
+// RUN: %clang_cc1 -fopenmp -x c -triple amdgpu-amd-amdhsa 
-fopenmp-targets=amdgpu-amd-amdhsa -save-temps=cwd -emit-llvm 
-fopenmp-is-target-device -x cpp-output %t-openmp-amdgcn-amd-amdhsa-gfx90a.i 
-fopenmp-host-ir-file-path %t-x86_64-unknown-unknown.bc -o - | FileCheck %s
 // expected-no-diagnostics
 #ifndef HEADER
 #define HEADER
diff --git a/clang/test/OpenMP/amdgcn_sret_ctor.cpp 
b/clang/test/OpenMP/amdgcn_sret_ctor.cpp
index 5d2f63c61e57d..ce5cc5bcb5bb2 100644
--- a/clang/test/OpenMP/amdgcn_sret_ctor.cpp
+++ b/clang/test/OpenMP/amdgcn_sret_ctor.cpp
@@ -1,5 +1,5 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py 
UTC_ARGS: --include-generated-funcs --version 5
-// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple amdgcn-amd-amdhsa 
-emit-llvm %s -fopenmp-is-target-device -o - | FileCheck %s
+// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple amdgpu-amd-amdhsa 
-emit-llvm %s -fopenmp-is-target-device -o - | FileCheck %s
 
 #pragma omp begin declare target
 struct S {
diff --git a/clang/test/OpenMP/amdgcn_target_codegen.cpp 
b/clang/test/OpenMP/amdgcn_target_codegen.cpp
index 0063ac945d3bf..8bd414bfc6fe9 100644
--- a/clang/test/OpenMP/amdgcn_target_codegen.cpp
+++ b/clang/test/OpenMP/amdgcn_target_codegen.cpp
@@ -1,8 +1,8 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py 
UTC_ARGS: --function-signature --include-generated-funcs --replace-value-regex 
"__omp_offloading_[0-9a-z]+_[0-9a-z]+" "reduction_size[.].+[.]" 
"pl_cond[.].+[.|,]" --prefix-filecheck-ir-name _
 // REQUIRES: amdgpu-registered-target
 
-// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm-bc %s -o %t-ppc-host.bc
-// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple amdgcn-amd-amdhsa 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck %s
+// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm-bc %s -o %t-ppc-host.bc
+// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple amdgpu-amd-amdhsa 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck %s
 // expected-no-diagnostics
 #ifndef HEADER
 #define HEADER
diff --git a/clang/test/OpenMP/amdgcn_target_device_vla.cpp 
b/clang/test/OpenMP/amdgcn_target_device_vla.cpp
index 5064c114c0863..c3350fe217151 100644
--- a/clang/test/OpenMP/amdgcn_target_device_vla.cpp
+++ b/clang/test/OpenMP/amdgcn_target_device_vla.cpp
@@ -1,8 +1,8 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py 
UTC_ARGS: --function-signature --include-generated-funcs --replace-value-regex 
"__omp_offloading_[0-9a-z]+_[0-9a-z]+" "reduction_size[.].+[.]" 
"pl_cond[.].+[.|,]" --prefix-filecheck-ir-name _
 // REQUIRES: amdgpu-registered-target
 
-// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm-bc %s -o %t-ppc-host.bc
-// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple amdgcn-amd-amdhsa 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck %s
+// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm-bc %s -o %t-ppc-host.bc
+// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple amdgpu-amd-amdhsa 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck %s
 // expected-no-diagnostics
 #ifndef HEADER
 #define HEADER
diff --git a/clang/test/OpenMP/amdgcn_target_global_constructor.cpp 
b/clang/test/OpenMP/amdgcn_target_global_constructor.cpp
index cbbb1514daf52..7f3dc4c6e63fd 100644
--- a/clang/test/OpenMP/amdgcn_target_global_constructor.cpp
+++ b/clang/test/OpenMP/amdgcn_target_global_constructor.cpp
@@ -1,8 +1,8 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py 
UTC_ARGS: --function-signature --check-globals --include-generated-funcs 
--replace-value-regex "__omp_offloading_[0-9a-z]+_[0-9a-z]+" 
"reduction_size[.].+[.]" "pl_cond[.].+[.|,]" --prefix-filecheck-ir-name _
 // REQUIRES: amdgpu-registered-target
 
-// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm-bc %s -o %t-ppc-host.bc
-// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple amdgcn-amd-amdhsa 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck %s
+// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm-bc %s -o %t-ppc-host.bc
+// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple amdgpu-amd-amdhsa 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck %s
 // expected-no-diagnostics
 #ifndef HEADER
 #define HEADER
diff --git a/clang/test/OpenMP/amdgcn_target_init_temp_alloca.cpp 
b/clang/test/OpenMP/amdgcn_target_init_temp_alloca.cpp
index e3c350969dd79..38a77244e6c18 100644
--- a/clang/test/OpenMP/amdgcn_target_init_temp_alloca.cpp
+++ b/clang/test/OpenMP/amdgcn_target_init_temp_alloca.cpp
@@ -1,7 +1,7 @@
 // REQUIRES: amdgpu-registered-target
 
-// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm-bc %s -o %t-ppc-host.bc
-// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple amdgcn-amd-amdhsa 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck %s
+// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm-bc %s -o %t-ppc-host.bc
+// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple amdgpu-amd-amdhsa 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck %s
 // expected-no-diagnostics
 
 #define N 100
diff --git a/clang/test/OpenMP/amdgcn_weak_alias.c 
b/clang/test/OpenMP/amdgcn_weak_alias.c
index 4cc54b9f15b43..3ad72a41176bc 100644
--- a/clang/test/OpenMP/amdgcn_weak_alias.c
+++ b/clang/test/OpenMP/amdgcn_weak_alias.c
@@ -1,9 +1,9 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py 
UTC_ARGS: --check-globals all --version 6
 // REQUIRES: amdgpu-registered-target
 
-// RUN: %clang_cc1 -fopenmp -x c -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm-bc %s -o %t-ppc-host.bc
-// RUN: %clang_cc1 -fopenmp -x c -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s -o - | FileCheck %s 
--check-prefix=HOST
-// RUN: %clang_cc1 -fopenmp -x c -triple amdgcn-amd-amdhsa 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck %s 
--check-prefix=DEVICE
+// RUN: %clang_cc1 -fopenmp -x c -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm-bc %s -o %t-ppc-host.bc
+// RUN: %clang_cc1 -fopenmp -x c -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s -o - | FileCheck %s 
--check-prefix=HOST
+// RUN: %clang_cc1 -fopenmp -x c -triple amdgpu-amd-amdhsa 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck %s 
--check-prefix=DEVICE
 
 //.
 // HOST: @__One_var = global i32 1, align 4
diff --git a/clang/test/OpenMP/amdgcn_weak_alias.cpp 
b/clang/test/OpenMP/amdgcn_weak_alias.cpp
index 08cb576a72322..f7ce91e8231c2 100644
--- a/clang/test/OpenMP/amdgcn_weak_alias.cpp
+++ b/clang/test/OpenMP/amdgcn_weak_alias.cpp
@@ -1,7 +1,7 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py 
UTC_ARGS: --check-globals all --version 6
-// RUN: %clang_cc1 -fopenmp -x c++ -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm-bc %s -o %t-ppc-host.bc
-// RUN: %clang_cc1 -fopenmp -x c++ -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s -o - | FileCheck %s 
--check-prefix=HOST
-// RUN: %clang_cc1 -fopenmp -x c++ -triple amdgcn-amd-amdhsa 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck %s 
--check-prefix=DEVICE
+// RUN: %clang_cc1 -fopenmp -x c++ -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm-bc %s -o %t-ppc-host.bc
+// RUN: %clang_cc1 -fopenmp -x c++ -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s -o - | FileCheck %s 
--check-prefix=HOST
+// RUN: %clang_cc1 -fopenmp -x c++ -triple amdgpu-amd-amdhsa 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck %s 
--check-prefix=DEVICE
 
 //.
 // HOST: @_Z3Onev = weak alias i32 (), ptr @_Z5__Onev
diff --git a/clang/test/OpenMP/amdgpu-unsafe-fp-atomics.cpp 
b/clang/test/OpenMP/amdgpu-unsafe-fp-atomics.cpp
index 60d7cb008a368..5dccaf77375e5 100644
--- a/clang/test/OpenMP/amdgpu-unsafe-fp-atomics.cpp
+++ b/clang/test/OpenMP/amdgpu-unsafe-fp-atomics.cpp
@@ -1,6 +1,6 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py 
UTC_ARGS: --version 5
-// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple amdgcn-amd-amdhsa 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device -o - 
| FileCheck -check-prefix=DEFAULT %s
-// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple amdgcn-amd-amdhsa 
-fopenmp-targets=amdgcn-amd-amdhsa -munsafe-fp-atomics -emit-llvm %s 
-fopenmp-is-target-device -o - | FileCheck -check-prefix=UNSAFE-FP-ATOMICS %s
+// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple amdgpu-amd-amdhsa 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device -o - 
| FileCheck -check-prefix=DEFAULT %s
+// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple amdgpu-amd-amdhsa 
-fopenmp-targets=amdgpu-amd-amdhsa -munsafe-fp-atomics -emit-llvm %s 
-fopenmp-is-target-device -o - | FileCheck -check-prefix=UNSAFE-FP-ATOMICS %s
 
 #pragma omp declare target
 
@@ -11,7 +11,7 @@ double dv, dx;
 // DEFAULT-SAME: ) #[[ATTR0:[0-9]+]] {
 // DEFAULT-NEXT:  [[ENTRY:.*:]]
 // DEFAULT-NEXT:    [[TMP0:%.*]] = load float, ptr addrspacecast (ptr 
addrspace(1) @fv to ptr), align 4
-// DEFAULT-NEXT:    [[TMP1:%.*]] = atomicrmw fadd ptr addrspacecast (ptr 
addrspace(1) @fx to ptr), float [[TMP0]] monotonic, align 4, 
!amdgpu.no.fine.grained.memory [[META5:![0-9]+]], !amdgpu.no.remote.memory 
[[META5]]
+// DEFAULT-NEXT:    [[TMP1:%.*]] = atomicrmw fadd ptr addrspacecast (ptr 
addrspace(1) @fx to ptr), float [[TMP0]] monotonic, align 4, 
!amdgpu.no.fine.grained.memory [[META4:![0-9]+]], !amdgpu.no.remote.memory 
[[META4]]
 // DEFAULT-NEXT:    [[ADD:%.*]] = fadd float [[TMP1]], [[TMP0]]
 // DEFAULT-NEXT:    store float [[ADD]], ptr addrspacecast (ptr addrspace(1) 
@fv to ptr), align 4
 // DEFAULT-NEXT:    ret void
@@ -20,7 +20,7 @@ double dv, dx;
 // UNSAFE-FP-ATOMICS-SAME: ) #[[ATTR0:[0-9]+]] {
 // UNSAFE-FP-ATOMICS-NEXT:  [[ENTRY:.*:]]
 // UNSAFE-FP-ATOMICS-NEXT:    [[TMP0:%.*]] = load float, ptr addrspacecast 
(ptr addrspace(1) @fv to ptr), align 4
-// UNSAFE-FP-ATOMICS-NEXT:    [[TMP1:%.*]] = atomicrmw fadd ptr addrspacecast 
(ptr addrspace(1) @fx to ptr), float [[TMP0]] monotonic, align 4, 
!amdgpu.no.fine.grained.memory [[META5:![0-9]+]], !amdgpu.no.remote.memory 
[[META5]], !amdgpu.ignore.denormal.mode [[META5]]
+// UNSAFE-FP-ATOMICS-NEXT:    [[TMP1:%.*]] = atomicrmw fadd ptr addrspacecast 
(ptr addrspace(1) @fx to ptr), float [[TMP0]] monotonic, align 4, 
!amdgpu.no.fine.grained.memory [[META4:![0-9]+]], !amdgpu.no.remote.memory 
[[META4]], !amdgpu.ignore.denormal.mode [[META4]]
 // UNSAFE-FP-ATOMICS-NEXT:    [[ADD:%.*]] = fadd float [[TMP1]], [[TMP0]]
 // UNSAFE-FP-ATOMICS-NEXT:    store float [[ADD]], ptr addrspacecast (ptr 
addrspace(1) @fv to ptr), align 4
 // UNSAFE-FP-ATOMICS-NEXT:    ret void
@@ -34,7 +34,7 @@ void atomic_fadd_f32() {
 // DEFAULT-SAME: ) #[[ATTR0]] {
 // DEFAULT-NEXT:  [[ENTRY:.*:]]
 // DEFAULT-NEXT:    [[TMP0:%.*]] = load double, ptr addrspacecast (ptr 
addrspace(1) @dv to ptr), align 8
-// DEFAULT-NEXT:    [[TMP1:%.*]] = atomicrmw fadd ptr addrspacecast (ptr 
addrspace(1) @dx to ptr), double [[TMP0]] monotonic, align 8, 
!amdgpu.no.fine.grained.memory [[META5]], !amdgpu.no.remote.memory [[META5]]
+// DEFAULT-NEXT:    [[TMP1:%.*]] = atomicrmw fadd ptr addrspacecast (ptr 
addrspace(1) @dx to ptr), double [[TMP0]] monotonic, align 8, 
!amdgpu.no.fine.grained.memory [[META4]], !amdgpu.no.remote.memory [[META4]]
 // DEFAULT-NEXT:    [[ADD:%.*]] = fadd double [[TMP1]], [[TMP0]]
 // DEFAULT-NEXT:    store double [[ADD]], ptr addrspacecast (ptr addrspace(1) 
@dv to ptr), align 8
 // DEFAULT-NEXT:    ret void
@@ -43,7 +43,7 @@ void atomic_fadd_f32() {
 // UNSAFE-FP-ATOMICS-SAME: ) #[[ATTR0]] {
 // UNSAFE-FP-ATOMICS-NEXT:  [[ENTRY:.*:]]
 // UNSAFE-FP-ATOMICS-NEXT:    [[TMP0:%.*]] = load double, ptr addrspacecast 
(ptr addrspace(1) @dv to ptr), align 8
-// UNSAFE-FP-ATOMICS-NEXT:    [[TMP1:%.*]] = atomicrmw fadd ptr addrspacecast 
(ptr addrspace(1) @dx to ptr), double [[TMP0]] monotonic, align 8, 
!amdgpu.no.fine.grained.memory [[META5]], !amdgpu.no.remote.memory [[META5]]
+// UNSAFE-FP-ATOMICS-NEXT:    [[TMP1:%.*]] = atomicrmw fadd ptr addrspacecast 
(ptr addrspace(1) @dx to ptr), double [[TMP0]] monotonic, align 8, 
!amdgpu.no.fine.grained.memory [[META4]], !amdgpu.no.remote.memory [[META4]]
 // UNSAFE-FP-ATOMICS-NEXT:    [[ADD:%.*]] = fadd double [[TMP1]], [[TMP0]]
 // UNSAFE-FP-ATOMICS-NEXT:    store double [[ADD]], ptr addrspacecast (ptr 
addrspace(1) @dv to ptr), align 8
 // UNSAFE-FP-ATOMICS-NEXT:    ret void
@@ -55,7 +55,7 @@ void atomic_fadd_f64() {
 
 #pragma omp end declare target
 //.
-// DEFAULT: [[META5]] = !{}
+// DEFAULT: [[META4]] = !{}
 //.
-// UNSAFE-FP-ATOMICS: [[META5]] = !{}
+// UNSAFE-FP-ATOMICS: [[META4]] = !{}
 //.
diff --git a/clang/test/OpenMP/amdgpu_exceptions.cpp 
b/clang/test/OpenMP/amdgpu_exceptions.cpp
index ae7bf072680d0..9bbc707a583bf 100644
--- a/clang/test/OpenMP/amdgpu_exceptions.cpp
+++ b/clang/test/OpenMP/amdgpu_exceptions.cpp
@@ -7,10 +7,10 @@
  * target region but emit a warning instead.
 */
 
-// RUN: %clang_cc1 -fopenmp -triple amdgcn-amd-amdhsa 
-fopenmp-is-target-device -fcxx-exceptions -fexceptions %s -verify=with 
-Wopenmp-target-exception -analyze
-// RUN: %clang_cc1 -fopenmp -triple amdgcn-amd-amdhsa 
-fopenmp-is-target-device -fcxx-exceptions -fexceptions %s -verify=with 
-Wopenmp-target-exception -analyze
-// RUN: %clang_cc1 -fopenmp -triple amdgcn-amd-amdhsa 
-fopenmp-is-target-device -fexceptions %s -verify=with 
-Wopenmp-target-exception -analyze
-// RUN: %clang_cc1 -fopenmp -triple amdgcn-amd-amdhsa 
-fopenmp-is-target-device %s -verify=with -Wopenmp-target-exception -analyze
+// RUN: %clang_cc1 -fopenmp -triple amdgpu-amd-amdhsa 
-fopenmp-is-target-device -fcxx-exceptions -fexceptions %s -verify=with 
-Wopenmp-target-exception -analyze
+// RUN: %clang_cc1 -fopenmp -triple amdgpu-amd-amdhsa 
-fopenmp-is-target-device -fcxx-exceptions -fexceptions %s -verify=with 
-Wopenmp-target-exception -analyze
+// RUN: %clang_cc1 -fopenmp -triple amdgpu-amd-amdhsa 
-fopenmp-is-target-device -fexceptions %s -verify=with 
-Wopenmp-target-exception -analyze
+// RUN: %clang_cc1 -fopenmp -triple amdgpu-amd-amdhsa 
-fopenmp-is-target-device %s -verify=with -Wopenmp-target-exception -analyze
 
 /**
  * The following four lines test that no warning is emitted when providing 
@@ -18,17 +18,17 @@
  * -fcxx-exceptions.
 */
 
-// RUN: %clang_cc1 -fopenmp -triple amdgcn-amd-amdhsa 
-fopenmp-is-target-device -fcxx-exceptions -fexceptions %s -verify=without 
-Wno-openmp-target-exception -analyze
-// RUN: %clang_cc1 -fopenmp -triple amdgcn-amd-amdhsa 
-fopenmp-is-target-device -fcxx-exceptions %s -verify=without 
-Wno-openmp-target-exception -analyze
-// RUN: %clang_cc1 -fopenmp -triple amdgcn-amd-amdhsa 
-fopenmp-is-target-device -fexceptions %s -verify=without 
-Wno-openmp-target-exception -analyze
-// RUN: %clang_cc1 -fopenmp -triple amdgcn-amd-amdhsa 
-fopenmp-is-target-device %s -verify=without -Wno-openmp-target-exception 
-analyze
+// RUN: %clang_cc1 -fopenmp -triple amdgpu-amd-amdhsa 
-fopenmp-is-target-device -fcxx-exceptions -fexceptions %s -verify=without 
-Wno-openmp-target-exception -analyze
+// RUN: %clang_cc1 -fopenmp -triple amdgpu-amd-amdhsa 
-fopenmp-is-target-device -fcxx-exceptions %s -verify=without 
-Wno-openmp-target-exception -analyze
+// RUN: %clang_cc1 -fopenmp -triple amdgpu-amd-amdhsa 
-fopenmp-is-target-device -fexceptions %s -verify=without 
-Wno-openmp-target-exception -analyze
+// RUN: %clang_cc1 -fopenmp -triple amdgpu-amd-amdhsa 
-fopenmp-is-target-device %s -verify=without -Wno-openmp-target-exception 
-analyze
 
 /**
  * Finally we should test that we only ignore exceptions in the OpenMP 
  * offloading tool-chain
 */
 
-// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa %s -emit-llvm-only 
-verify=noexceptions
+// RUN: %clang_cc1 -triple amdgpu-amd-amdhsa %s -emit-llvm-only 
-verify=noexceptions
 
 // noexceptions-error@39 {{cannot use 'try' with exceptions disabled}}
 // noexceptions-error@40 {{cannot use 'throw' with exceptions disabled}}
@@ -36,8 +36,8 @@
 #pragma omp declare target
 int foo(void) {
        int error = -1;
-       try { // with-warning {{target 'amdgcn-amd-amdhsa' does not support 
exception handling; 'catch' block is ignored}}
-               throw 404; // with-warning {{target 'amdgcn-amd-amdhsa' does 
not support exception handling; 'throw' is assumed to be never reached}}
+       try { // with-warning {{target 'amdgpu-amd-amdhsa' does not support 
exception handling; 'catch' block is ignored}}
+               throw 404; // with-warning {{target 'amdgpu-amd-amdhsa' does 
not support exception handling; 'throw' is assumed to be never reached}}
        }
        catch (int e){ 
                error = e;
diff --git a/clang/test/OpenMP/amdgpu_target_with_aligned_attribute.c 
b/clang/test/OpenMP/amdgpu_target_with_aligned_attribute.c
index 3f9d2225c7de1..4376927f24251 100644
--- a/clang/test/OpenMP/amdgpu_target_with_aligned_attribute.c
+++ b/clang/test/OpenMP/amdgpu_target_with_aligned_attribute.c
@@ -5,8 +5,8 @@
 #ifndef HEADER
 #define HEADER
 
-// RUN: %clang_cc1 -verify -fopenmp -x c -triple powerpc64le-unknown-unknown 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm-bc %s -o %t-ppc-host-amd.bc
-// RUN: %clang_cc1 -verify -fopenmp -x c -triple amdgcn-amd-amdhsa 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-ppc-host-amd.bc -o - | FileCheck %s 
--check-prefix=CHECK-AMD
+// RUN: %clang_cc1 -verify -fopenmp -x c -triple powerpc64le-unknown-unknown 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm-bc %s -o %t-ppc-host-amd.bc
+// RUN: %clang_cc1 -verify -fopenmp -x c -triple amdgpu-amd-amdhsa 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-ppc-host-amd.bc -o - | FileCheck %s 
--check-prefix=CHECK-AMD
 
 
 void write_to_aligned_array(int *a, int N) {
diff --git a/clang/test/OpenMP/amdgpu_throw.cpp 
b/clang/test/OpenMP/amdgpu_throw.cpp
index 84d861371a825..4cfa7e9739b81 100644
--- a/clang/test/OpenMP/amdgpu_throw.cpp
+++ b/clang/test/OpenMP/amdgpu_throw.cpp
@@ -7,10 +7,10 @@
  * target region but emit a warning instead.
 */
 
-// RUN: %clang_cc1 -fopenmp -triple amdgcn-amd-amdhsa 
-fopenmp-is-target-device -fcxx-exceptions -fexceptions %s -verify=with 
-Wopenmp-target-exception -analyze
-// RUN: %clang_cc1 -fopenmp -triple amdgcn-amd-amdhsa 
-fopenmp-is-target-device -fcxx-exceptions -fexceptions %s -verify=with 
-Wopenmp-target-exception -analyze
-// RUN: %clang_cc1 -fopenmp -triple amdgcn-amd-amdhsa 
-fopenmp-is-target-device -fexceptions %s -verify=with 
-Wopenmp-target-exception -analyze
-// RUN: %clang_cc1 -fopenmp -triple amdgcn-amd-amdhsa 
-fopenmp-is-target-device %s -verify=with -Wopenmp-target-exception -analyze
+// RUN: %clang_cc1 -fopenmp -triple amdgpu-amd-amdhsa 
-fopenmp-is-target-device -fcxx-exceptions -fexceptions %s -verify=with 
-Wopenmp-target-exception -analyze
+// RUN: %clang_cc1 -fopenmp -triple amdgpu-amd-amdhsa 
-fopenmp-is-target-device -fcxx-exceptions -fexceptions %s -verify=with 
-Wopenmp-target-exception -analyze
+// RUN: %clang_cc1 -fopenmp -triple amdgpu-amd-amdhsa 
-fopenmp-is-target-device -fexceptions %s -verify=with 
-Wopenmp-target-exception -analyze
+// RUN: %clang_cc1 -fopenmp -triple amdgpu-amd-amdhsa 
-fopenmp-is-target-device %s -verify=with -Wopenmp-target-exception -analyze
 
 /**
  * The following four lines test that no warning is emitted when providing 
@@ -18,23 +18,23 @@
  * -fcxx-exceptions.
 */
 
-// RUN: %clang_cc1 -fopenmp -triple amdgcn-amd-amdhsa 
-fopenmp-is-target-device -fcxx-exceptions -fexceptions %s -verify=without 
-Wno-openmp-target-exception -analyze
-// RUN: %clang_cc1 -fopenmp -triple amdgcn-amd-amdhsa 
-fopenmp-is-target-device -fcxx-exceptions %s -verify=without 
-Wno-openmp-target-exception -analyze
-// RUN: %clang_cc1 -fopenmp -triple amdgcn-amd-amdhsa 
-fopenmp-is-target-device -fexceptions %s -verify=without 
-Wno-openmp-target-exception -analyze
-// RUN: %clang_cc1 -fopenmp -triple amdgcn-amd-amdhsa 
-fopenmp-is-target-device %s -verify=without -Wno-openmp-target-exception 
-analyze
+// RUN: %clang_cc1 -fopenmp -triple amdgpu-amd-amdhsa 
-fopenmp-is-target-device -fcxx-exceptions -fexceptions %s -verify=without 
-Wno-openmp-target-exception -analyze
+// RUN: %clang_cc1 -fopenmp -triple amdgpu-amd-amdhsa 
-fopenmp-is-target-device -fcxx-exceptions %s -verify=without 
-Wno-openmp-target-exception -analyze
+// RUN: %clang_cc1 -fopenmp -triple amdgpu-amd-amdhsa 
-fopenmp-is-target-device -fexceptions %s -verify=without 
-Wno-openmp-target-exception -analyze
+// RUN: %clang_cc1 -fopenmp -triple amdgpu-amd-amdhsa 
-fopenmp-is-target-device %s -verify=without -Wno-openmp-target-exception 
-analyze
 
 /**
  * Finally we should test that we only ignore exceptions in the OpenMP 
  * offloading tool-chain
 */
 
-// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa %s -emit-llvm-only 
-verify=noexceptions
+// RUN: %clang_cc1 -triple amdgpu-amd-amdhsa %s -emit-llvm-only 
-verify=noexceptions
 
 // noexceptions-error@37 {{cannot use 'throw' with exceptions disabled}}
 
 #pragma omp declare target
 void foo(void) {
-       throw 404; // with-warning {{target 'amdgcn-amd-amdhsa' does not 
support exception handling; 'throw' is assumed to be never reached}}
+       throw 404; // with-warning {{target 'amdgpu-amd-amdhsa' does not 
support exception handling; 'throw' is assumed to be never reached}}
 }
 #pragma omp end declare target
 // without-no-diagnostics
diff --git a/clang/test/OpenMP/amdgpu_throw_trap.cpp 
b/clang/test/OpenMP/amdgpu_throw_trap.cpp
index 50ead7532c5aa..e84d7df0f7b2f 100644
--- a/clang/test/OpenMP/amdgpu_throw_trap.cpp
+++ b/clang/test/OpenMP/amdgpu_throw_trap.cpp
@@ -1,6 +1,6 @@
 // REQUIRES: amdgpu-registered-target, x86-registered-target
 
-// RUN: %clang_cc1 -fopenmp -triple amdgcn-amd-amdhsa 
-fopenmp-is-target-device %s -S -Wno-openmp-target-exception -o - | FileCheck 
-check-prefix=DEVICE %s
+// RUN: %clang_cc1 -fopenmp -triple amdgpu-amd-amdhsa 
-fopenmp-is-target-device %s -S -Wno-openmp-target-exception -o - | FileCheck 
-check-prefix=DEVICE %s
 // RUN: %clang_cc1 -fopenmp -triple x86_64-pc-linux-gnu 
-fopenmp-is-target-device -fcxx-exceptions %s -S -Wno-openmp-target-exception 
-o - | FileCheck -check-prefix=HOST %s
 // DEVICE: s_trap
 // DEVICE-NOT: __cxa_throw
diff --git a/clang/test/OpenMP/amdgpu_try_catch.cpp 
b/clang/test/OpenMP/amdgpu_try_catch.cpp
index 3ea1a76f2a68c..4747323269d6b 100644
--- a/clang/test/OpenMP/amdgpu_try_catch.cpp
+++ b/clang/test/OpenMP/amdgpu_try_catch.cpp
@@ -7,10 +7,10 @@
  * target region but emit a warning instead.
 */
 
-// RUN: %clang_cc1 -fopenmp -triple amdgcn-amd-amdhsa 
-fopenmp-is-target-device -fcxx-exceptions -fexceptions %s -verify=with 
-Wopenmp-target-exception -analyze
-// RUN: %clang_cc1 -fopenmp -triple amdgcn-amd-amdhsa 
-fopenmp-is-target-device -fcxx-exceptions -fexceptions %s -verify=with 
-Wopenmp-target-exception -analyze
-// RUN: %clang_cc1 -fopenmp -triple amdgcn-amd-amdhsa 
-fopenmp-is-target-device -fexceptions %s -verify=with 
-Wopenmp-target-exception -analyze
-// RUN: %clang_cc1 -fopenmp -triple amdgcn-amd-amdhsa 
-fopenmp-is-target-device %s -verify=with -Wopenmp-target-exception -analyze
+// RUN: %clang_cc1 -fopenmp -triple amdgpu-amd-amdhsa 
-fopenmp-is-target-device -fcxx-exceptions -fexceptions %s -verify=with 
-Wopenmp-target-exception -analyze
+// RUN: %clang_cc1 -fopenmp -triple amdgpu-amd-amdhsa 
-fopenmp-is-target-device -fcxx-exceptions -fexceptions %s -verify=with 
-Wopenmp-target-exception -analyze
+// RUN: %clang_cc1 -fopenmp -triple amdgpu-amd-amdhsa 
-fopenmp-is-target-device -fexceptions %s -verify=with 
-Wopenmp-target-exception -analyze
+// RUN: %clang_cc1 -fopenmp -triple amdgpu-amd-amdhsa 
-fopenmp-is-target-device %s -verify=with -Wopenmp-target-exception -analyze
 
 /**
  * The following four lines test that no warning is emitted when providing 
@@ -18,24 +18,24 @@
  * -fcxx-exceptions.
 */
 
-// RUN: %clang_cc1 -fopenmp -triple amdgcn-amd-amdhsa 
-fopenmp-is-target-device -fcxx-exceptions -fexceptions %s -verify=without 
-Wno-openmp-target-exception -analyze
-// RUN: %clang_cc1 -fopenmp -triple amdgcn-amd-amdhsa 
-fopenmp-is-target-device -fcxx-exceptions %s -verify=without 
-Wno-openmp-target-exception -analyze
-// RUN: %clang_cc1 -fopenmp -triple amdgcn-amd-amdhsa 
-fopenmp-is-target-device -fexceptions %s -verify=without 
-Wno-openmp-target-exception -analyze
-// RUN: %clang_cc1 -fopenmp -triple amdgcn-amd-amdhsa 
-fopenmp-is-target-device %s -verify=without -Wno-openmp-target-exception 
-analyze
+// RUN: %clang_cc1 -fopenmp -triple amdgpu-amd-amdhsa 
-fopenmp-is-target-device -fcxx-exceptions -fexceptions %s -verify=without 
-Wno-openmp-target-exception -analyze
+// RUN: %clang_cc1 -fopenmp -triple amdgpu-amd-amdhsa 
-fopenmp-is-target-device -fcxx-exceptions %s -verify=without 
-Wno-openmp-target-exception -analyze
+// RUN: %clang_cc1 -fopenmp -triple amdgpu-amd-amdhsa 
-fopenmp-is-target-device -fexceptions %s -verify=without 
-Wno-openmp-target-exception -analyze
+// RUN: %clang_cc1 -fopenmp -triple amdgpu-amd-amdhsa 
-fopenmp-is-target-device %s -verify=without -Wno-openmp-target-exception 
-analyze
 
 /**
  * Finally we should test that we only ignore exceptions in the OpenMP 
  * offloading tool-chain
 */
 
-// RUN: %clang_cc1 -triple amdgcn-amd-amdhsa %s -emit-llvm-only 
-verify=noexceptions
+// RUN: %clang_cc1 -triple amdgpu-amd-amdhsa %s -emit-llvm-only 
-verify=noexceptions
 
 // noexceptions-error@38 {{cannot use 'try' with exceptions disabled}}
 
 #pragma omp declare target
 int foo(void) {
        int error = -1;
-       try { // with-warning {{target 'amdgcn-amd-amdhsa' does not support 
exception handling; 'catch' block is ignored}}
+       try { // with-warning {{target 'amdgpu-amd-amdhsa' does not support 
exception handling; 'catch' block is ignored}}
                error = 1;
        }
        catch (int e){ 
diff --git a/clang/test/OpenMP/copy-gaps-1.cpp 
b/clang/test/OpenMP/copy-gaps-1.cpp
index db83543403998..3eb9291897082 100644
--- a/clang/test/OpenMP/copy-gaps-1.cpp
+++ b/clang/test/OpenMP/copy-gaps-1.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -verify -triple x86_64-pc-linux-gnu 
-fopenmp-targets=amdgcn-amd-amdhsa -fopenmp -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang_cc1 -verify -triple x86_64-pc-linux-gnu 
-fopenmp-targets=amdgpu-amd-amdhsa -fopenmp -emit-llvm %s -o - | FileCheck %s
 // expected-no-diagnostics
 
 struct S {
diff --git a/clang/test/OpenMP/copy-gaps-2.cpp 
b/clang/test/OpenMP/copy-gaps-2.cpp
index 05786582af8c6..e3c10d9db0700 100644
--- a/clang/test/OpenMP/copy-gaps-2.cpp
+++ b/clang/test/OpenMP/copy-gaps-2.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -verify -triple x86_64-pc-linux-gnu 
-fopenmp-targets=amdgcn-amd-amdhsa -fopenmp -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang_cc1 -verify -triple x86_64-pc-linux-gnu 
-fopenmp-targets=amdgpu-amd-amdhsa -fopenmp -emit-llvm %s -o - | FileCheck %s
 // expected-no-diagnostics
 
 struct S {
diff --git a/clang/test/OpenMP/copy-gaps-3.cpp 
b/clang/test/OpenMP/copy-gaps-3.cpp
index a4160697f9c68..e68e01469595a 100644
--- a/clang/test/OpenMP/copy-gaps-3.cpp
+++ b/clang/test/OpenMP/copy-gaps-3.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -verify -triple x86_64-pc-linux-gnu 
-fopenmp-targets=amdgcn-amd-amdhsa -fopenmp -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang_cc1 -verify -triple x86_64-pc-linux-gnu 
-fopenmp-targets=amdgpu-amd-amdhsa -fopenmp -emit-llvm %s -o - | FileCheck %s
 // expected-no-diagnostics
 
 struct S {
diff --git a/clang/test/OpenMP/copy-gaps-4.cpp 
b/clang/test/OpenMP/copy-gaps-4.cpp
index 2ec8d337565d9..eeccb87b86b40 100644
--- a/clang/test/OpenMP/copy-gaps-4.cpp
+++ b/clang/test/OpenMP/copy-gaps-4.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -verify -triple x86_64-pc-linux-gnu 
-fopenmp-targets=amdgcn-amd-amdhsa -fopenmp -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang_cc1 -verify -triple x86_64-pc-linux-gnu 
-fopenmp-targets=amdgpu-amd-amdhsa -fopenmp -emit-llvm %s -o - | FileCheck %s
 // expected-no-diagnostics
 
 struct S {
diff --git a/clang/test/OpenMP/copy-gaps-5.cpp 
b/clang/test/OpenMP/copy-gaps-5.cpp
index cd593d678d48c..ffe97db322108 100644
--- a/clang/test/OpenMP/copy-gaps-5.cpp
+++ b/clang/test/OpenMP/copy-gaps-5.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -verify -triple x86_64-pc-linux-gnu 
-fopenmp-targets=amdgcn-amd-amdhsa -fopenmp -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang_cc1 -verify -triple x86_64-pc-linux-gnu 
-fopenmp-targets=amdgpu-amd-amdhsa -fopenmp -emit-llvm %s -o - | FileCheck %s
 // expected-no-diagnostics
 
 template<typename C>
diff --git a/clang/test/OpenMP/copy-gaps-6.cpp 
b/clang/test/OpenMP/copy-gaps-6.cpp
index e7e1b001fe265..6a8e4a87881cc 100644
--- a/clang/test/OpenMP/copy-gaps-6.cpp
+++ b/clang/test/OpenMP/copy-gaps-6.cpp
@@ -1,4 +1,4 @@
-// RUN: %clang_cc1 -verify -triple x86_64-pc-linux-gnu 
-fopenmp-targets=amdgcn-amd-amdhsa -fopenmp -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang_cc1 -verify -triple x86_64-pc-linux-gnu 
-fopenmp-targets=amdgpu-amd-amdhsa -fopenmp -emit-llvm %s -o - | FileCheck %s
 // expected-no-diagnostics
 
 struct S {
diff --git a/clang/test/OpenMP/debug-info-kmpc.cpp 
b/clang/test/OpenMP/debug-info-kmpc.cpp
index ee4e0108469c8..b411ede3a50f1 100644
--- a/clang/test/OpenMP/debug-info-kmpc.cpp
+++ b/clang/test/OpenMP/debug-info-kmpc.cpp
@@ -1,5 +1,5 @@
-// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm-bc %s -o %t-ppc-host.bc
-// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple amdgcn-amd-amdhsa 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
"-debug-info-kind=constructor" -fopenmp-host-ir-file-path %t-ppc-host.bc -o - | 
FileCheck %s
+// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm-bc %s -o %t-ppc-host.bc
+// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple amdgpu-amd-amdhsa 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
"-debug-info-kind=constructor" -fopenmp-host-ir-file-path %t-ppc-host.bc -o - | 
FileCheck %s
 
 // Check that we properly attach debug info to the __kmpc_global_thread_num 
call
 // CHECK: call {{.*}} @__kmpc_global_thread_num{{.*}}!dbg
diff --git a/clang/test/OpenMP/declare_target_local_codegen.cpp 
b/clang/test/OpenMP/declare_target_local_codegen.cpp
index fe3a46aed5916..c07d2f426ce50 100644
--- a/clang/test/OpenMP/declare_target_local_codegen.cpp
+++ b/clang/test/OpenMP/declare_target_local_codegen.cpp
@@ -1,9 +1,9 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py 
UTC_ARGS: --function-signature --include-generated-funcs --replace-value-regex 
"__omp_offloading_[0-9a-z]+_[0-9a-z]+" "reduction_size[.].+[.]" 
"pl_cond[.].+[.|,]" --prefix-filecheck-ir-name _
-// RUN: %clang_cc1 -verify=omp60 -fopenmp -fopenmp-version=60 -x c++ -triple 
powerpc64le-unknown-unknown -fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s -o 
- | FileCheck %s --check-prefix=HOST
-// RUN: %clang_cc1 -verify=omp60 -fopenmp -fopenmp-version=60 -x c++ -triple 
powerpc64le-unknown-unknown -fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm-bc %s 
-o %t-host.bc
-// RUN: %clang_cc1 -verify=omp60 -fopenmp -fopenmp-version=60 -x c++ -triple 
amdgcn-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fvisibility=protected -fopenmp-host-ir-file-path %t-host.bc -o - | FileCheck 
%s --check-prefix=DEVICE
-// RUN: %clang_cc1 -verify=omp60 -fopenmp -fopenmp-version=60 -x c++ -triple 
amdgcn-amd-amdhsa %s -fopenmp-is-target-device -fvisibility=protected 
-fopenmp-host-ir-file-path %t-host.bc -emit-pch -o %t
-// RUN: %clang_cc1 -fopenmp -fopenmp-version=60 -x c++ -triple 
amdgcn-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fvisibility=protected -fopenmp-host-ir-file-path %t-host.bc -include-pch %t -o 
- | FileCheck %s --check-prefix=DEVICE
+// RUN: %clang_cc1 -verify=omp60 -fopenmp -fopenmp-version=60 -x c++ -triple 
powerpc64le-unknown-unknown -fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s -o 
- | FileCheck %s --check-prefix=HOST
+// RUN: %clang_cc1 -verify=omp60 -fopenmp -fopenmp-version=60 -x c++ -triple 
powerpc64le-unknown-unknown -fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm-bc %s 
-o %t-host.bc
+// RUN: %clang_cc1 -verify=omp60 -fopenmp -fopenmp-version=60 -x c++ -triple 
amdgpu-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fvisibility=protected -fopenmp-host-ir-file-path %t-host.bc -o - | FileCheck 
%s --check-prefix=DEVICE
+// RUN: %clang_cc1 -verify=omp60 -fopenmp -fopenmp-version=60 -x c++ -triple 
amdgpu-amd-amdhsa %s -fopenmp-is-target-device -fvisibility=protected 
-fopenmp-host-ir-file-path %t-host.bc -emit-pch -o %t
+// RUN: %clang_cc1 -fopenmp -fopenmp-version=60 -x c++ -triple 
amdgpu-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fvisibility=protected -fopenmp-host-ir-file-path %t-host.bc -include-pch %t -o 
- | FileCheck %s --check-prefix=DEVICE
 
 #ifndef HEADER
 #define HEADER
diff --git a/clang/test/OpenMP/declare_target_local_map_messages.cpp 
b/clang/test/OpenMP/declare_target_local_map_messages.cpp
index d3fd97c2d139b..5f0f19970ce14 100644
--- a/clang/test/OpenMP/declare_target_local_map_messages.cpp
+++ b/clang/test/OpenMP/declare_target_local_map_messages.cpp
@@ -1,7 +1,7 @@
 // RUN: %clang_cc1 -verify -fopenmp -fopenmp-version=60 -x c++ \
 // RUN:   -triple x86_64-unknown-unknown %s
 // RUN: %clang_cc1 -verify -fopenmp -fopenmp-version=60 -x c++ \
-// RUN:   -triple x86_64-unknown-unknown -fopenmp-targets=amdgcn-amd-amdhsa %s
+// RUN:   -triple x86_64-unknown-unknown -fopenmp-targets=amdgpu-amd-amdhsa %s
 
 // OpenMP 6.0 [7.9.6]: device-local variable must not appear in map clause.
 
diff --git a/clang/test/OpenMP/declare_target_local_usm_codegen.cpp 
b/clang/test/OpenMP/declare_target_local_usm_codegen.cpp
index d97d6f409d265..65842b07f6916 100644
--- a/clang/test/OpenMP/declare_target_local_usm_codegen.cpp
+++ b/clang/test/OpenMP/declare_target_local_usm_codegen.cpp
@@ -8,9 +8,9 @@
 // absence of ref ptr and offload entry for local variable and, by contrast,
 // presence of ref ptr and offload entry for enter variable.
 
-// RUN: %clang_cc1 -verify -fopenmp -fopenmp-version=60 -x c++ -triple 
powerpc64le-unknown-unknown -fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s -o 
- | FileCheck %s --check-prefix=HOST
-// RUN: %clang_cc1 -verify -fopenmp -fopenmp-version=60 -x c++ -triple 
powerpc64le-unknown-unknown -fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm-bc %s 
-o %t-host.bc
-// RUN: %clang_cc1 -verify -fopenmp -fopenmp-version=60 -x c++ -triple 
amdgcn-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fvisibility=protected -fopenmp-host-ir-file-path %t-host.bc -o - | FileCheck 
%s --check-prefix=DEVICE
+// RUN: %clang_cc1 -verify -fopenmp -fopenmp-version=60 -x c++ -triple 
powerpc64le-unknown-unknown -fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s -o 
- | FileCheck %s --check-prefix=HOST
+// RUN: %clang_cc1 -verify -fopenmp -fopenmp-version=60 -x c++ -triple 
powerpc64le-unknown-unknown -fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm-bc %s 
-o %t-host.bc
+// RUN: %clang_cc1 -verify -fopenmp -fopenmp-version=60 -x c++ -triple 
amdgpu-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fvisibility=protected -fopenmp-host-ir-file-path %t-host.bc -o - | FileCheck 
%s --check-prefix=DEVICE
 
 // expected-no-diagnostics
 
diff --git a/clang/test/OpenMP/declare_target_nohost_variant_messages.cpp 
b/clang/test/OpenMP/declare_target_nohost_variant_messages.cpp
index 62206d3020e96..b58521d4fe6fa 100644
--- a/clang/test/OpenMP/declare_target_nohost_variant_messages.cpp
+++ b/clang/test/OpenMP/declare_target_nohost_variant_messages.cpp
@@ -1,6 +1,6 @@
 // REQUIRES: amdgpu-registered-target
 
-// RUN: %clang_cc1 -fopenmp -fopenmp-targets=amdgcn-amd-amdhsa 
-fopenmp-version=52 -triple powerpc64le-unknown-unknown -DVERBOSE_MODE=1 
-verify=omp52 -fnoopenmp-use-tls -ferror-limit 100 
-fopenmp-targets=amdgcn-amd-amdhsa -o - %s
+// RUN: %clang_cc1 -fopenmp -fopenmp-targets=amdgpu-amd-amdhsa 
-fopenmp-version=52 -triple powerpc64le-unknown-unknown -DVERBOSE_MODE=1 
-verify=omp52 -fnoopenmp-use-tls -ferror-limit 100 
-fopenmp-targets=amdgpu-amd-amdhsa -o - %s
 
 void fun();
 void host_function();
diff --git a/clang/test/OpenMP/declare_variant_construct_codegen_1.c 
b/clang/test/OpenMP/declare_variant_construct_codegen_1.c
index 5e659f05773d1..05db6fb74d683 100644
--- a/clang/test/OpenMP/declare_variant_construct_codegen_1.c
+++ b/clang/test/OpenMP/declare_variant_construct_codegen_1.c
@@ -8,18 +8,18 @@
 // RUN: %clang_cc1 -DCK1 -fopenmp -x c -triple x86_64-unknown-linux 
-include-pch %t -verify %s -emit-llvm -o - -fopenmp-version=45 | FileCheck %s 
--check-prefix=CK1
 // RUN: %clang_cc1 -DCK1 -fopenmp -x c -triple x86_64-unknown-linux 
-fopenmp-targets=nvptx64-nvidia-cuda -emit-llvm %s -o - | FileCheck %s 
--check-prefix=CK1
 // RUN: %clang_cc1 -DCK1 -fopenmp -x c -triple x86_64-unknown-linux 
-fopenmp-targets=spirv64 -emit-llvm %s -o - | FileCheck %s --check-prefix=CK1
-// RUN: %clang_cc1 -DCK1 -fopenmp -x c -triple x86_64-unknown-linux 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s -o - | FileCheck %s 
--check-prefix=CK1
-// RUN: %clang_cc1 -DCK1 -fopenmp -x c -triple x86_64-unknown-linux 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-pch -o %t %s
-// RUN: %clang_cc1 -DCK1 -fopenmp -x c -triple x86_64-unknown-linux 
-fopenmp-targets=amdgcn-amd-amdhsa -include-pch %t -verify %s -emit-llvm -o - | 
FileCheck %s --check-prefix=CK1
+// RUN: %clang_cc1 -DCK1 -fopenmp -x c -triple x86_64-unknown-linux 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s -o - | FileCheck %s 
--check-prefix=CK1
+// RUN: %clang_cc1 -DCK1 -fopenmp -x c -triple x86_64-unknown-linux 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-pch -o %t %s
+// RUN: %clang_cc1 -DCK1 -fopenmp -x c -triple x86_64-unknown-linux 
-fopenmp-targets=amdgpu-amd-amdhsa -include-pch %t -verify %s -emit-llvm -o - | 
FileCheck %s --check-prefix=CK1
 
 // RUN: %clang_cc1 -DCK1 -verify -fopenmp-simd -triple x86_64-unknown-linux 
-emit-llvm %s -o - | FileCheck %s --implicit-check-not="{{__kmpc|__tgt}}"
 // RUN: %clang_cc1 -DCK1 -fopenmp-simd -x c -triple x86_64-unknown-linux 
-emit-pch -o %t -fopenmp-version=45 %s
 // RUN: %clang_cc1 -DCK1 -fopenmp-simd -x c -triple x86_64-unknown-linux 
-include-pch %t -verify %s -emit-llvm -o - -fopenmp-version=45 | FileCheck %s 
--implicit-check-not="{{__kmpc|__tgt}}"
 // RUN: %clang_cc1 -DCK1 -fopenmp-simd -x c -triple x86_64-unknown-linux 
-fopenmp-targets=nvptx64-nvidia-cuda -emit-llvm %s -o - | FileCheck %s 
--implicit-check-not="{{__kmpc|__tgt}}"
 // RUN: %clang_cc1 -DCK1 -fopenmp-simd -x c -triple x86_64-unknown-linux 
-fopenmp-targets=spirv64 -emit-llvm %s -o - | FileCheck %s 
--implicit-check-not="{{__kmpc|__tgt}}"
-// RUN: %clang_cc1 -DCK1 -fopenmp-simd -x c -triple x86_64-unknown-linux 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s -o - | FileCheck %s 
--implicit-check-not="{{__kmpc|__tgt}}"
-// RUN: %clang_cc1 -DCK1 -fopenmp-simd -x c -triple x86_64-unknown-linux 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-pch -o %t %s
-// RUN: %clang_cc1 -DCK1 -fopenmp-simd -x c -triple x86_64-unknown-linux 
-fopenmp-targets=amdgcn-amd-amdhsa -include-pch %t -verify %s -emit-llvm -o - | 
FileCheck %s --implicit-check-not="{{__kmpc|__tgt}}"
+// RUN: %clang_cc1 -DCK1 -fopenmp-simd -x c -triple x86_64-unknown-linux 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s -o - | FileCheck %s 
--implicit-check-not="{{__kmpc|__tgt}}"
+// RUN: %clang_cc1 -DCK1 -fopenmp-simd -x c -triple x86_64-unknown-linux 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-pch -o %t %s
+// RUN: %clang_cc1 -DCK1 -fopenmp-simd -x c -triple x86_64-unknown-linux 
-fopenmp-targets=amdgpu-amd-amdhsa -include-pch %t -verify %s -emit-llvm -o - | 
FileCheck %s --implicit-check-not="{{__kmpc|__tgt}}"
 
 #ifdef CK1
 
@@ -93,17 +93,17 @@ int test(void) {
 // RUN: %clang_cc1 -DCK2 -fopenmp -x c -triple x86_64-unknown-linux 
-include-pch %t -verify %s -emit-llvm -o - -fopenmp-version=45 | FileCheck %s 
--check-prefix=CK2
 // RUN: %clang_cc1 -DCK2 -fopenmp -x c -triple x86_64-unknown-linux 
-fopenmp-targets=nvptx64-nvidia-cuda -emit-llvm %s -o - | FileCheck %s 
--check-prefix=CK2
 // RUN: %clang_cc1 -DCK2 -fopenmp -x c -triple x86_64-unknown-linux 
-fopenmp-targets=spirv64 -emit-llvm %s -o - | FileCheck %s --check-prefix=CK2
-// RUN: %clang_cc1 -DCK2 -fopenmp -x c -triple x86_64-unknown-linux 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s -o - | FileCheck %s 
--check-prefix=CK2
-// RUN: %clang_cc1 -DCK2 -fopenmp -x c -triple x86_64-unknown-linux 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-pch -o %t %s
-// RUN: %clang_cc1 -DCK2 -fopenmp -x c -triple x86_64-unknown-linux 
-fopenmp-targets=amdgcn-amd-amdhsa -include-pch %t -verify %s -emit-llvm -o - | 
FileCheck %s --check-prefix=CK2
+// RUN: %clang_cc1 -DCK2 -fopenmp -x c -triple x86_64-unknown-linux 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s -o - | FileCheck %s 
--check-prefix=CK2
+// RUN: %clang_cc1 -DCK2 -fopenmp -x c -triple x86_64-unknown-linux 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-pch -o %t %s
+// RUN: %clang_cc1 -DCK2 -fopenmp -x c -triple x86_64-unknown-linux 
-fopenmp-targets=amdgpu-amd-amdhsa -include-pch %t -verify %s -emit-llvm -o - | 
FileCheck %s --check-prefix=CK2
 
 // RUN: %clang_cc1 -DCK2 -verify -fopenmp-simd -triple x86_64-unknown-linux 
-emit-llvm %s -o - | FileCheck %s --implicit-check-not="{{__kmpc|__tgt}}"
 // RUN: %clang_cc1 -DCK2 -fopenmp-simd -x c -triple x86_64-unknown-linux 
-emit-pch -o %t -fopenmp-version=45 %s
 // RUN: %clang_cc1 -DCK2 -fopenmp-simd -x c -triple x86_64-unknown-linux 
-include-pch %t -verify %s -emit-llvm -o - -fopenmp-version=45 | FileCheck %s 
--implicit-check-not="{{__kmpc|__tgt}}"
 // RUN: %clang_cc1 -DCK2 -fopenmp-simd -x c -triple x86_64-unknown-linux 
-fopenmp-targets=nvptx64-nvidia-cuda -emit-llvm %s -o - | FileCheck %s 
--implicit-check-not="{{__kmpc|__tgt}}"
-// RUN: %clang_cc1 -DCK2 -fopenmp-simd -x c -triple x86_64-unknown-linux 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s -o - | FileCheck %s 
--implicit-check-not="{{__kmpc|__tgt}}"
-// RUN: %clang_cc1 -DCK2 -fopenmp-simd -x c -triple x86_64-unknown-linux 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-pch -o %t %s
-// RUN: %clang_cc1 -DCK2 -fopenmp-simd -x c -triple x86_64-unknown-linux 
-fopenmp-targets=amdgcn-amd-amdhsa -include-pch %t -verify %s -emit-llvm -o - | 
FileCheck %s --implicit-check-not="{{__kmpc|__tgt}}"
+// RUN: %clang_cc1 -DCK2 -fopenmp-simd -x c -triple x86_64-unknown-linux 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s -o - | FileCheck %s 
--implicit-check-not="{{__kmpc|__tgt}}"
+// RUN: %clang_cc1 -DCK2 -fopenmp-simd -x c -triple x86_64-unknown-linux 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-pch -o %t %s
+// RUN: %clang_cc1 -DCK2 -fopenmp-simd -x c -triple x86_64-unknown-linux 
-fopenmp-targets=amdgpu-amd-amdhsa -include-pch %t -verify %s -emit-llvm -o - | 
FileCheck %s --implicit-check-not="{{__kmpc|__tgt}}"
 
 #ifdef CK2
 
@@ -190,18 +190,18 @@ void test(int ***v1, int ***v2, int ***v3, int n) {
 // RUN: %clang_cc1 -DCK3 -fopenmp -x c -triple x86_64-unknown-linux -emit-pch 
-o %t -fopenmp-version=45 %s
 // RUN: %clang_cc1 -DCK3 -fopenmp -x c -triple x86_64-unknown-linux 
-include-pch %t -verify %s -emit-llvm -o - -fopenmp-version=45 | FileCheck %s 
--check-prefix=CK3
 // RUN: %clang_cc1 -DCK3 -fopenmp -x c -triple x86_64-unknown-linux 
-fopenmp-targets=nvptx64-nvidia-cuda -emit-llvm %s -o - | FileCheck %s 
--check-prefix=CK3
-// RUN: %clang_cc1 -DCK3 -fopenmp -x c -triple x86_64-unknown-linux 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s -o - | FileCheck %s 
--check-prefix=CK3
-// RUN: %clang_cc1 -DCK3 -fopenmp -x c -triple x86_64-unknown-linux 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-pch -o %t %s
-// RUN: %clang_cc1 -DCK3 -fopenmp -x c -triple x86_64-unknown-linux 
-fopenmp-targets=amdgcn-amd-amdhsa -include-pch %t -verify %s -emit-llvm -o - | 
FileCheck %s --check-prefix=CK3
+// RUN: %clang_cc1 -DCK3 -fopenmp -x c -triple x86_64-unknown-linux 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s -o - | FileCheck %s 
--check-prefix=CK3
+// RUN: %clang_cc1 -DCK3 -fopenmp -x c -triple x86_64-unknown-linux 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-pch -o %t %s
+// RUN: %clang_cc1 -DCK3 -fopenmp -x c -triple x86_64-unknown-linux 
-fopenmp-targets=amdgpu-amd-amdhsa -include-pch %t -verify %s -emit-llvm -o - | 
FileCheck %s --check-prefix=CK3
 
 // RUN: %clang_cc1 -DCK3 -verify -fopenmp-simd -triple x86_64-unknown-linux 
-emit-llvm %s -o - | FileCheck %s --implicit-check-not="{{__kmpc|__tgt}}"
 // RUN: %clang_cc1 -DCK3 -fopenmp-simd -x c -triple x86_64-unknown-linux 
-emit-pch -o %t -fopenmp-version=45 %s
 // RUN: %clang_cc1 -DCK3 -fopenmp-simd -x c -triple x86_64-unknown-linux 
-include-pch %t -verify %s -emit-llvm -o - -fopenmp-version=45 | FileCheck %s 
--implicit-check-not="{{__kmpc|__tgt}}"
 // RUN: %clang_cc1 -DCK3 -fopenmp-simd -x c -triple x86_64-unknown-linux 
-fopenmp-targets=nvptx64-nvidia-cuda -emit-llvm %s -o - | FileCheck %s 
--implicit-check-not="{{__kmpc|__tgt}}"
 // RUN: %clang_cc1 -DCK3 -fopenmp-simd -x c -triple x86_64-unknown-linux 
-fopenmp-targets=spirv64 -emit-llvm %s -o - | FileCheck %s 
--implicit-check-not="{{__kmpc|__tgt}}"
-// RUN: %clang_cc1 -DCK3 -fopenmp-simd -x c -triple x86_64-unknown-linux 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s -o - | FileCheck %s 
--implicit-check-not="{{__kmpc|__tgt}}"
-// RUN: %clang_cc1 -DCK3 -fopenmp-simd -x c -triple x86_64-unknown-linux 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-pch -o %t %s
-// RUN: %clang_cc1 -DCK3 -fopenmp-simd -x c -triple x86_64-unknown-linux 
-fopenmp-targets=amdgcn-amd-amdhsa -include-pch %t -verify %s -emit-llvm -o - | 
FileCheck %s --implicit-check-not="{{__kmpc|__tgt}}"
+// RUN: %clang_cc1 -DCK3 -fopenmp-simd -x c -triple x86_64-unknown-linux 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s -o - | FileCheck %s 
--implicit-check-not="{{__kmpc|__tgt}}"
+// RUN: %clang_cc1 -DCK3 -fopenmp-simd -x c -triple x86_64-unknown-linux 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-pch -o %t %s
+// RUN: %clang_cc1 -DCK3 -fopenmp-simd -x c -triple x86_64-unknown-linux 
-fopenmp-targets=amdgpu-amd-amdhsa -include-pch %t -verify %s -emit-llvm -o - | 
FileCheck %s --implicit-check-not="{{__kmpc|__tgt}}"
 
 #ifdef CK3
 
@@ -257,18 +257,18 @@ void test(void) {
 // RUN: %clang_cc1 -DCK4 -fopenmp -x c -triple x86_64-unknown-linux 
-include-pch %t -verify %s -emit-llvm -o - -fopenmp-version=45 | FileCheck %s 
--check-prefix=CK4
 // RUN: %clang_cc1 -DCK4 -fopenmp -x c -triple x86_64-unknown-linux 
-fopenmp-targets=nvptx64-nvidia-cuda -emit-llvm %s -o - | FileCheck %s 
--check-prefix=CK4
 // RUN: %clang_cc1 -DCK4 -fopenmp -x c -triple x86_64-unknown-linux 
-fopenmp-targets=spirv64 -emit-llvm %s -o - | FileCheck %s --check-prefix=CK4
-// RUN: %clang_cc1 -DCK4 -fopenmp -x c -triple x86_64-unknown-linux 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s -o - | FileCheck %s 
--check-prefix=CK4
-// RUN: %clang_cc1 -DCK4 -fopenmp -x c -triple x86_64-unknown-linux 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-pch -o %t %s
-// RUN: %clang_cc1 -DCK4 -fopenmp -x c -triple x86_64-unknown-linux 
-fopenmp-targets=amdgcn-amd-amdhsa -include-pch %t -verify %s -emit-llvm -o - | 
FileCheck %s --check-prefix=CK4
+// RUN: %clang_cc1 -DCK4 -fopenmp -x c -triple x86_64-unknown-linux 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s -o - | FileCheck %s 
--check-prefix=CK4
+// RUN: %clang_cc1 -DCK4 -fopenmp -x c -triple x86_64-unknown-linux 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-pch -o %t %s
+// RUN: %clang_cc1 -DCK4 -fopenmp -x c -triple x86_64-unknown-linux 
-fopenmp-targets=amdgpu-amd-amdhsa -include-pch %t -verify %s -emit-llvm -o - | 
FileCheck %s --check-prefix=CK4
 
 // RUN: %clang_cc1 -DCK4 -verify -fopenmp-simd -triple x86_64-unknown-linux 
-emit-llvm %s -o - | FileCheck %s --implicit-check-not="{{__kmpc|__tgt}}"
 // RUN: %clang_cc1 -DCK4 -fopenmp-simd -x c -triple x86_64-unknown-linux 
-emit-pch -o %t -fopenmp-version=45 %s
 // RUN: %clang_cc1 -DCK4 -fopenmp-simd -x c -triple x86_64-unknown-linux 
-include-pch %t -verify %s -emit-llvm -o - -fopenmp-version=45 | FileCheck %s 
--implicit-check-not="{{__kmpc|__tgt}}"
 // RUN: %clang_cc1 -DCK4 -fopenmp-simd -x c -triple x86_64-unknown-linux 
-fopenmp-targets=nvptx64-nvidia-cuda -emit-llvm %s -o - | FileCheck %s 
--implicit-check-not="{{__kmpc|__tgt}}"
 // RUN: %clang_cc1 -DCK4 -fopenmp-simd -x c -triple x86_64-unknown-linux 
-fopenmp-targets=spirv64 -emit-llvm %s -o - | FileCheck %s 
--implicit-check-not="{{__kmpc|__tgt}}"
-// RUN: %clang_cc1 -DCK4 -fopenmp-simd -x c -triple x86_64-unknown-linux 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s -o - | FileCheck %s 
--implicit-check-not="{{__kmpc|__tgt}}"
-// RUN: %clang_cc1 -DCK4 -fopenmp-simd -x c -triple x86_64-unknown-linux 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-pch -o %t %s
-// RUN: %clang_cc1 -DCK4 -fopenmp-simd -x c -triple x86_64-unknown-linux 
-fopenmp-targets=amdgcn-amd-amdhsa -include-pch %t -verify %s -emit-llvm -o - | 
FileCheck %s --implicit-check-not="{{__kmpc|__tgt}}"
+// RUN: %clang_cc1 -DCK4 -fopenmp-simd -x c -triple x86_64-unknown-linux 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s -o - | FileCheck %s 
--implicit-check-not="{{__kmpc|__tgt}}"
+// RUN: %clang_cc1 -DCK4 -fopenmp-simd -x c -triple x86_64-unknown-linux 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-pch -o %t %s
+// RUN: %clang_cc1 -DCK4 -fopenmp-simd -x c -triple x86_64-unknown-linux 
-fopenmp-targets=amdgpu-amd-amdhsa -include-pch %t -verify %s -emit-llvm -o - | 
FileCheck %s --implicit-check-not="{{__kmpc|__tgt}}"
 
 #ifdef CK4
 
diff --git a/clang/test/OpenMP/force-usm.c b/clang/test/OpenMP/force-usm.c
index f4504e8b53d32..abb8a3f696dc4 100644
--- a/clang/test/OpenMP/force-usm.c
+++ b/clang/test/OpenMP/force-usm.c
@@ -1,11 +1,11 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py 
UTC_ARGS: --include-generated-funcs --replace-value-regex 
"__omp_offloading_[0-9a-z]+_[0-9a-z]+" "pl_cond[.].+[.|,]" 
--prefix-filecheck-ir-name _ --version 3
 // REQUIRES: amdgpu-registered-target
 
-// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgcn-amd-amdhsa -fopenmp-force-usm -emit-llvm-bc %s -o 
%t-ppc-host.bc
-// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple amdgcn-amd-amdhsa 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s -fopenmp-force-usm 
-fopenmp-is-device -fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck 
-check-prefix=CHECK-USM %s
+// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgpu-amd-amdhsa -fopenmp-force-usm -emit-llvm-bc %s -o 
%t-ppc-host.bc
+// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple amdgpu-amd-amdhsa 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s -fopenmp-force-usm 
-fopenmp-is-device -fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck 
-check-prefix=CHECK-USM %s
 
-// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm-bc %s -o %t-ppc-host.bc
-// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple amdgcn-amd-amdhsa 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s -fopenmp-is-device 
-fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck 
-check-prefix=CHECK-DEFAULT %s
+// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm-bc %s -o %t-ppc-host.bc
+// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple amdgpu-amd-amdhsa 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s -fopenmp-is-device 
-fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck 
-check-prefix=CHECK-DEFAULT %s
 // expected-no-diagnostics
 
 extern "C" void *malloc(unsigned int b);
diff --git a/clang/test/OpenMP/interop_codegen.cpp 
b/clang/test/OpenMP/interop_codegen.cpp
index 1d0b56da6ff0b..a60d2b75187ed 100644
--- a/clang/test/OpenMP/interop_codegen.cpp
+++ b/clang/test/OpenMP/interop_codegen.cpp
@@ -1,5 +1,5 @@
 // expected-no-diagnostics
-// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s -o - | FileCheck %s
+// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s -o - | FileCheck %s
 // RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown 
-fopenmp-targets=nvptx64-nvidia-cuda -emit-llvm %s -o - | FileCheck %s
 // RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown 
-fopenmp-targets=spirv64 -emit-llvm %s -o - | FileCheck %s
 // RUN: %clang_cc1  -verify -fopenmp -x c++ -std=c++11 -triple 
powerpc64le-unknown-unknown -fopenmp-targets=powerpc64le-ibm-linux-gnu 
-emit-llvm %s -o - | FileCheck %s
diff --git a/clang/test/OpenMP/metadirective_ast_print.c 
b/clang/test/OpenMP/metadirective_ast_print.c
index 75ef5fa26827c..82254dd878b2b 100644
--- a/clang/test/OpenMP/metadirective_ast_print.c
+++ b/clang/test/OpenMP/metadirective_ast_print.c
@@ -2,9 +2,9 @@
 
 // RUN: %clang_cc1 -verify -fopenmp-simd -triple x86_64-unknown-linux-gnu -x c 
-std=c99 -ast-print %s -o - | FileCheck %s --check-prefix=DEFAULT
 
-// RUN: %clang_cc1 -verify -fopenmp -triple amdgcn-amd-amdhsa -x c -std=c99 
-ast-print %s -o - | FileCheck %s --check-prefix=DEFAULT-GPU
+// RUN: %clang_cc1 -verify -fopenmp -triple amdgpu-amd-amdhsa -x c -std=c99 
-ast-print %s -o - | FileCheck %s --check-prefix=DEFAULT-GPU
 
-// RUN: %clang_cc1 -verify -fopenmp-simd -triple amdgcn-amd-amdhsa -x c 
-std=c99 -ast-print %s -o - | FileCheck %s --check-prefix=DEFAULT-GPU
+// RUN: %clang_cc1 -verify -fopenmp-simd -triple amdgpu-amd-amdhsa -x c 
-std=c99 -ast-print %s -o - | FileCheck %s --check-prefix=DEFAULT-GPU
 
 // RUN: %clang_cc1 -verify -fopenmp -triple spirv64-intel -x c -std=c99 
-ast-print %s -o - | FileCheck %s --check-prefix=DEFAULT-GPU
 
@@ -14,9 +14,9 @@
 
 // RUN: %clang_cc1 -verify -fopenmp-simd -fopenmp-version=52 -DOMP52 -triple 
x86_64-unknown-linux-gnu -x c -std=c99 -ast-print %s -o - | FileCheck %s 
--check-prefix=OMP52
 
-// RUN: %clang_cc1 -verify -fopenmp -fopenmp-version=52 -DOMP52 -triple 
amdgcn-amd-amdhsa -x c -std=c99 -ast-print %s -o - | FileCheck %s 
--check-prefix=OMP52-GPU
+// RUN: %clang_cc1 -verify -fopenmp -fopenmp-version=52 -DOMP52 -triple 
amdgpu-amd-amdhsa -x c -std=c99 -ast-print %s -o - | FileCheck %s 
--check-prefix=OMP52-GPU
 
-// RUN: %clang_cc1 -verify -fopenmp-simd -fopenmp-version=52 -DOMP52 -triple 
amdgcn-amd-amdhsa -x c -std=c99 -ast-print %s -o - | FileCheck %s 
--check-prefix=OMP52-GPU
+// RUN: %clang_cc1 -verify -fopenmp-simd -fopenmp-version=52 -DOMP52 -triple 
amdgpu-amd-amdhsa -x c -std=c99 -ast-print %s -o - | FileCheck %s 
--check-prefix=OMP52-GPU
 
 // RUN: %clang_cc1 -verify -fopenmp -fopenmp-version=52 -DOMP52 -triple 
spirv64-intel -x c -std=c99 -ast-print %s -o - | FileCheck %s 
--check-prefix=OMP52-GPU
 
diff --git a/clang/test/OpenMP/metadirective_device_arch_codegen.cpp 
b/clang/test/OpenMP/metadirective_device_arch_codegen.cpp
index 9db7e2a0c8222..4f89767f29a6b 100644
--- a/clang/test/OpenMP/metadirective_device_arch_codegen.cpp
+++ b/clang/test/OpenMP/metadirective_device_arch_codegen.cpp
@@ -1,5 +1,5 @@
-// RUN: %clang_cc1 -fopenmp -x c++ -w -std=c++11 -triple 
x86_64-unknown-unknown -fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm-bc %s -o 
%t-ppc-host.bc
-// RUN: %clang_cc1 -fopenmp -x c++ -w -std=c++11 -triple amdgpu9.06-amd-amdhsa 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck %s
+// RUN: %clang_cc1 -fopenmp -x c++ -w -std=c++11 -triple 
x86_64-unknown-unknown -fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm-bc %s -o 
%t-ppc-host.bc
+// RUN: %clang_cc1 -fopenmp -x c++ -w -std=c++11 -triple amdgpu9.06-amd-amdhsa 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck %s
 // RUN: %clang_cc1 -fopenmp -x c++ -w -std=c++11 -triple 
x86_64-unknown-unknown -fopenmp-targets=spirv64-intel -emit-llvm-bc %s -o 
%t-ppc-spirv-host.bc
 // RUN: %clang_cc1 -fopenmp -x c++ -w -std=c++11 -triple spirv64-intel 
-fopenmp-targets=spirv64-intel -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-ppc-spirv-host.bc  -o - | FileCheck %s
 // expected-no-diagnostics
diff --git a/clang/test/OpenMP/metadirective_device_isa_codegen_amdgcn.cpp 
b/clang/test/OpenMP/metadirective_device_isa_codegen_amdgcn.cpp
index 50407fa8b64da..8a20cc565669f 100644
--- a/clang/test/OpenMP/metadirective_device_isa_codegen_amdgcn.cpp
+++ b/clang/test/OpenMP/metadirective_device_isa_codegen_amdgcn.cpp
@@ -1,7 +1,7 @@
 // REQUIRES: amdgpu-registered-target
 
-// RUN: %clang_cc1 -fopenmp -x c++ -w -std=c++11 -triple 
x86_64-unknown-unknown -fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm-bc %s -o 
%t-ppc-host.bc
-// RUN: %clang_cc1 -fopenmp -x c++ -w -std=c++11 -triple amdgpu9.06-amd-amdhsa 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck %s
+// RUN: %clang_cc1 -fopenmp -x c++ -w -std=c++11 -triple 
x86_64-unknown-unknown -fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm-bc %s -o 
%t-ppc-host.bc
+// RUN: %clang_cc1 -fopenmp -x c++ -w -std=c++11 -triple amdgpu9.06-amd-amdhsa 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck %s
 // expected-no-diagnostics
 
 #ifndef HEADER
diff --git a/clang/test/OpenMP/ompx_attributes_codegen.cpp 
b/clang/test/OpenMP/ompx_attributes_codegen.cpp
index 6627c0f73e6d7..acae824eedbe6 100644
--- a/clang/test/OpenMP/ompx_attributes_codegen.cpp
+++ b/clang/test/OpenMP/ompx_attributes_codegen.cpp
@@ -1,9 +1,9 @@
 // REQUIRES: amdgpu-registered-target
 
-// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm-bc %s -o %t-ppc-host.bc
-// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple amdgcn-amd-amdhsa 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck %s --check-prefix=AMD
-// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple amdgpu9.00-amd-amdhsa 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck %s --check-prefix=AMD
-// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple amdgpu9.00-amd-amdhsa 
-fopenmp-targets=amdgcn-amd-amdhsa -dwarf-version=5 -emit-llvm %s 
-fopenmp-is-target-device -fopenmp-host-ir-file-path %t-ppc-host.bc -o - | 
FileCheck %s --check-prefix=AMD
+// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm-bc %s -o %t-ppc-host.bc
+// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple amdgpu-amd-amdhsa 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck %s --check-prefix=AMD
+// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple amdgpu9.00-amd-amdhsa 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck %s --check-prefix=AMD
+// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple amdgpu9.00-amd-amdhsa 
-fopenmp-targets=amdgpu-amd-amdhsa -dwarf-version=5 -emit-llvm %s 
-fopenmp-is-target-device -fopenmp-host-ir-file-path %t-ppc-host.bc -o - | 
FileCheck %s --check-prefix=AMD
 // RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple nvptx64 
-fopenmp-targets=nvptx64 -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck %s 
--check-prefix=NVIDIA
 // RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple nvptx64 
-fopenmp-targets=nvptx64 -emit-llvm %s -fopenmp-is-target-device 
-dwarf-version=5 -fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck %s 
--check-prefix=NVIDIA
 // RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple spirv64 
-fopenmp-targets=spirv64 -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck %s 
--check-prefix=SPIRV
diff --git a/clang/test/OpenMP/strided_update_variable_stride_codegen.c 
b/clang/test/OpenMP/strided_update_variable_stride_codegen.c
index 5d4a582bf2090..33bbe8b80ceb1 100644
--- a/clang/test/OpenMP/strided_update_variable_stride_codegen.c
+++ b/clang/test/OpenMP/strided_update_variable_stride_codegen.c
@@ -1,11 +1,11 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py 
UTC_ARGS: --check-globals --include-generated-funcs --replace-value-regex 
"__omp_offloading_[0-9a-z]+_[0-9a-z]+" "reduction_size[.].+[.]" 
"pl_cond[.].+[.|,]" --prefix-filecheck-ir-name _ --global-value-regex 
"\.offload_.*" --global-hex-value-regex ".offload_maptypes.*" --version 3
 
-// RUN: %clang_cc1 -fopenmp -x c -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s -o - \
+// RUN: %clang_cc1 -fopenmp -x c -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s -o - \
 // RUN: | FileCheck %s
 
 // Check same results after serialization round-trip
-// RUN: %clang_cc1 -fopenmp -x c -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-pch -o %t %s
-// RUN: %clang_cc1 -fopenmp -x c -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgcn-amd-amdhsa -include-pch %t -emit-llvm %s -o - \
+// RUN: %clang_cc1 -fopenmp -x c -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-pch -o %t %s
+// RUN: %clang_cc1 -fopenmp -x c -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgpu-amd-amdhsa -include-pch %t -emit-llvm %s -o - \
 // RUN: | FileCheck %s
 
 // expected-no-diagnostics
diff --git a/clang/test/OpenMP/target_data_if_logical_codegen.cpp 
b/clang/test/OpenMP/target_data_if_logical_codegen.cpp
index 54c4508dbdd29..3e592c8c17f47 100644
--- a/clang/test/OpenMP/target_data_if_logical_codegen.cpp
+++ b/clang/test/OpenMP/target_data_if_logical_codegen.cpp
@@ -1,11 +1,11 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py 
UTC_ARGS: --check-globals --include-generated-funcs --replace-value-regex 
"__omp_offloading_[0-9a-z]+_[0-9a-z]+" "reduction_size[.].+[.]" 
"pl_cond[.].+[.|,]" --prefix-filecheck-ir-name _ --global-value-regex 
"\.offload_.*" --global-hex-value-regex ".offload_maptypes.*" --version 3
 
-// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s -o - \
+// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s -o - \
 // RUN: | FileCheck %s
 
 // Check same results after serialization round-trip
-// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-pch -o %t %s
-// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgcn-amd-amdhsa -include-pch %t -emit-llvm %s -o - \
+// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-pch -o %t %s
+// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgpu-amd-amdhsa -include-pch %t -emit-llvm %s -o - \
 // RUN: | FileCheck %s
 
 // expected-no-diagnostics
diff --git a/clang/test/OpenMP/target_exceptions_messages.cpp 
b/clang/test/OpenMP/target_exceptions_messages.cpp
index 837fdb454c74f..ffa5d07cf5793 100644
--- a/clang/test/OpenMP/target_exceptions_messages.cpp
+++ b/clang/test/OpenMP/target_exceptions_messages.cpp
@@ -7,10 +7,10 @@
 // RUN:   -fexceptions -fcxx-exceptions -ferror-limit 100
 
 // RUN: %clang_cc1 -fopenmp -x c++ -triple powerpc64le-unknown-unknown \
-// RUN:   -verify=host -fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm-bc \
+// RUN:   -verify=host -fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm-bc \
 // RUN:   %s -o %t-ppc-host-amd.bc -fexceptions -fcxx-exceptions
-// RUN: %clang_cc1 -verify -fopenmp -x c++ -triple amdgcn-amd-amdhsa \
-// RUN:   -fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s \
+// RUN: %clang_cc1 -verify -fopenmp -x c++ -triple amdgpu-amd-amdhsa \
+// RUN:   -fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s \
 // RUN:   -fopenmp-is-target-device -fopenmp-host-ir-file-path 
%t-ppc-host-amd.bc -o - \
 // RUN:   -fexceptions -fcxx-exceptions -ferror-limit 100
 
diff --git a/clang/test/OpenMP/target_indirect_codegen.cpp 
b/clang/test/OpenMP/target_indirect_codegen.cpp
index fd8b6c76d0881..8a12c4b8b30d9 100644
--- a/clang/test/OpenMP/target_indirect_codegen.cpp
+++ b/clang/test/OpenMP/target_indirect_codegen.cpp
@@ -1,8 +1,8 @@
-// RUN: %clang_cc1 -verify -fopenmp -fopenmp-version=51 -x c++ -triple 
powerpc64le-unknown-unknown -fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s -o 
- | FileCheck %s --check-prefix=HOST
-// RUN: %clang_cc1 -verify -fopenmp -fopenmp-version=51 -x c++ -triple 
powerpc64le-unknown-unknown -fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm-bc %s 
-o %t-host.bc
-// RUN: %clang_cc1 -verify -fopenmp -fopenmp-version=51 -x c++ -triple 
amdgcn-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fvisibility=protected -fopenmp-host-ir-file-path %t-host.bc -o - | FileCheck 
%s --check-prefix=DEVICE
-// RUN: %clang_cc1 -verify -fopenmp -fopenmp-version=51 -x c++ -triple 
amdgcn-amd-amdhsa %s -fopenmp-is-target-device -fvisibility=protected 
-fopenmp-host-ir-file-path %t-host.bc -emit-pch -o %t
-// RUN: %clang_cc1 -verify -fopenmp -fopenmp-version=51 -x c++ -triple 
amdgcn-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fvisibility=protected -fopenmp-host-ir-file-path %t-host.bc -include-pch %t -o 
- | FileCheck %s --check-prefix=DEVICE
+// RUN: %clang_cc1 -verify -fopenmp -fopenmp-version=51 -x c++ -triple 
powerpc64le-unknown-unknown -fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s -o 
- | FileCheck %s --check-prefix=HOST
+// RUN: %clang_cc1 -verify -fopenmp -fopenmp-version=51 -x c++ -triple 
powerpc64le-unknown-unknown -fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm-bc %s 
-o %t-host.bc
+// RUN: %clang_cc1 -verify -fopenmp -fopenmp-version=51 -x c++ -triple 
amdgpu-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fvisibility=protected -fopenmp-host-ir-file-path %t-host.bc -o - | FileCheck 
%s --check-prefix=DEVICE
+// RUN: %clang_cc1 -verify -fopenmp -fopenmp-version=51 -x c++ -triple 
amdgpu-amd-amdhsa %s -fopenmp-is-target-device -fvisibility=protected 
-fopenmp-host-ir-file-path %t-host.bc -emit-pch -o %t
+// RUN: %clang_cc1 -verify -fopenmp -fopenmp-version=51 -x c++ -triple 
amdgpu-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fvisibility=protected -fopenmp-host-ir-file-path %t-host.bc -include-pch %t -o 
- | FileCheck %s --check-prefix=DEVICE
 
 // RUN: %clang_cc1 -verify -fopenmp -fopenmp-version=51 -x c++ -triple 
powerpc64le-unknown-unknown -fopenmp-targets=spirv64-intel -emit-llvm %s -o - | 
FileCheck %s --check-prefix=HOST
 // RUN: %clang_cc1 -verify -fopenmp -fopenmp-version=51 -x c++ -triple 
powerpc64le-unknown-unknown -fopenmp-targets=spirv64-intel -emit-llvm-bc %s -o 
%t-spirv-host.bc
diff --git a/clang/test/OpenMP/target_num_teams_num_threads_attributes.cpp 
b/clang/test/OpenMP/target_num_teams_num_threads_attributes.cpp
index 356b519d88f0d..3f8ad04b64d61 100644
--- a/clang/test/OpenMP/target_num_teams_num_threads_attributes.cpp
+++ b/clang/test/OpenMP/target_num_teams_num_threads_attributes.cpp
@@ -1,6 +1,6 @@
-// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm-bc %s -o %t-ppc-host.bc
-// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple amdgcn-amd-amdhsa 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck %s 
-// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple amdgpu9.00-amd-amdhsa 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck %s
+// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm-bc %s -o %t-ppc-host.bc
+// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple amdgpu-amd-amdhsa 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck %s 
+// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple amdgpu9.00-amd-amdhsa 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck %s
 // RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown 
-fopenmp-targets=nvptx64 -emit-llvm-bc %s -o %t-ppc-host.bc
 // RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple nvptx64 
-fopenmp-targets=nvptx64 -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck %s 
 // RUN: %clang_cc1 -target-cpu sm_80 -fopenmp -x c++ -std=c++11 -triple 
nvptx64 -fopenmp-targets=nvptx64 -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck %s
diff --git a/clang/test/OpenMP/target_parallel_generic_loop_codegen.cpp 
b/clang/test/OpenMP/target_parallel_generic_loop_codegen.cpp
index 22d3698a61de9..3178b86ad8719 100644
--- a/clang/test/OpenMP/target_parallel_generic_loop_codegen.cpp
+++ b/clang/test/OpenMP/target_parallel_generic_loop_codegen.cpp
@@ -1,8 +1,8 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py 
UTC_ARGS: --function-signature --include-generated-funcs --replace-value-regex 
"__omp_offloading_[0-9a-z]+_[0-9a-z]+" "reduction_size[.].+[.]" 
"pl_cond[.].+[.|,]" --prefix-filecheck-ir-name _
 // REQUIRES: amdgpu-registered-target
 
-// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm-bc %s -o %t-ppc-host.bc
-// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple amdgcn-amd-amdhsa 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck %s 
--check-prefix=IR-GPU
+// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm-bc %s -o %t-ppc-host.bc
+// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple amdgpu-amd-amdhsa 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck %s 
--check-prefix=IR-GPU
 
 // RUN: %clang_cc1 -verify -triple x86_64-pc-linux-gnu -fopenmp -emit-llvm %s 
-o - | FileCheck %s --check-prefix=IR
 
diff --git a/clang/test/OpenMP/target_parallel_no_exceptions.cpp 
b/clang/test/OpenMP/target_parallel_no_exceptions.cpp
index 5fcb389cc1606..068a90bcfaa08 100644
--- a/clang/test/OpenMP/target_parallel_no_exceptions.cpp
+++ b/clang/test/OpenMP/target_parallel_no_exceptions.cpp
@@ -1,7 +1,7 @@
 /// Make sure no exception messages are inclided in the llvm output.
 // RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple 
powerpc64le-unknown-unknown -fopenmp-targets=nvptx64-nvidia-cuda -emit-llvm-bc 
%s -o %t-ppc-host.bc
 // RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple nvptx64-unknown-unknown 
-fopenmp-targets=nvptx64-nvidia-cuda -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck %s --check-prefix 
CHK-EXCEPTION
-// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck %s --check-prefix 
CHK-EXCEPTION
+// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck %s --check-prefix 
CHK-EXCEPTION
 // RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown 
-fopenmp-targets=spirv64 -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck %s --check-prefix 
CHK-EXCEPTION
 
 void test_increment() {
diff --git a/clang/test/OpenMP/target_parallel_num_threads_strict_messages.cpp 
b/clang/test/OpenMP/target_parallel_num_threads_strict_messages.cpp
index 8ceff02d4ecfc..2edf95e0ad775 100644
--- a/clang/test/OpenMP/target_parallel_num_threads_strict_messages.cpp
+++ b/clang/test/OpenMP/target_parallel_num_threads_strict_messages.cpp
@@ -1,9 +1,9 @@
-// RUN: %clang_cc1 -DF1 -verify -fopenmp -fopenmp-version=60 -triple 
x86_64-unknown-unknown -fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm-bc %s -o 
%t-ppc-host-ppc.bc
-// RUN: %clang_cc1 -DF1 -DTARGET -verify -fopenmp -fopenmp-version=60 -triple 
amdgcn-amd-amdhsa -fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s 
-fopenmp-is-target-device -fopenmp-host-ir-file-path %t-ppc-host-ppc.bc -o 
/dev/null
-// RUN: %clang_cc1 -DF2 -verify -fopenmp -fopenmp-version=60 -triple 
x86_64-unknown-unknown -fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm-bc %s -o 
%t-ppc-host-ppc.bc
-// RUN: %clang_cc1 -DF2 -DTARGET -verify -fopenmp -fopenmp-version=60 -triple 
amdgcn-amd-amdhsa -fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s 
-fopenmp-is-target-device -fopenmp-host-ir-file-path %t-ppc-host-ppc.bc -o 
/dev/null
-// RUN: %clang_cc1 -DF3 -verify -fopenmp -fopenmp-version=60 -triple 
x86_64-unknown-unknown -fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm-bc %s -o 
%t-ppc-host-ppc.bc
-// RUN: %clang_cc1 -DF3 -DTARGET -verify -fopenmp -fopenmp-version=60 -triple 
amdgcn-amd-amdhsa -fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s 
-fopenmp-is-target-device -fopenmp-host-ir-file-path %t-ppc-host-ppc.bc -o 
/dev/null
+// RUN: %clang_cc1 -DF1 -verify -fopenmp -fopenmp-version=60 -triple 
x86_64-unknown-unknown -fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm-bc %s -o 
%t-ppc-host-ppc.bc
+// RUN: %clang_cc1 -DF1 -DTARGET -verify -fopenmp -fopenmp-version=60 -triple 
amdgpu-amd-amdhsa -fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s 
-fopenmp-is-target-device -fopenmp-host-ir-file-path %t-ppc-host-ppc.bc -o 
/dev/null
+// RUN: %clang_cc1 -DF2 -verify -fopenmp -fopenmp-version=60 -triple 
x86_64-unknown-unknown -fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm-bc %s -o 
%t-ppc-host-ppc.bc
+// RUN: %clang_cc1 -DF2 -DTARGET -verify -fopenmp -fopenmp-version=60 -triple 
amdgpu-amd-amdhsa -fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s 
-fopenmp-is-target-device -fopenmp-host-ir-file-path %t-ppc-host-ppc.bc -o 
/dev/null
+// RUN: %clang_cc1 -DF3 -verify -fopenmp -fopenmp-version=60 -triple 
x86_64-unknown-unknown -fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm-bc %s -o 
%t-ppc-host-ppc.bc
+// RUN: %clang_cc1 -DF3 -DTARGET -verify -fopenmp -fopenmp-version=60 -triple 
amdgpu-amd-amdhsa -fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s 
-fopenmp-is-target-device -fopenmp-host-ir-file-path %t-ppc-host-ppc.bc -o 
/dev/null
 
 // RUN: %clang_cc1 -DF1 -verify -fopenmp -fopenmp-version=60 -triple 
x86_64-unknown-unknown -fopenmp-targets=spirv64-intel -emit-llvm-bc %s -o 
%t-spirv-ppc-host-ppc.bc
 // RUN: %clang_cc1 -DF1 -DTARGET -verify -fopenmp -fopenmp-version=60 -triple 
spirv64-intel -fopenmp-targets=spirv64-intel -emit-llvm %s 
-fopenmp-is-target-device -fopenmp-host-ir-file-path %t-spirv-ppc-host-ppc.bc 
-o /dev/null
diff --git a/clang/test/OpenMP/target_team_variable_codegen.cpp 
b/clang/test/OpenMP/target_team_variable_codegen.cpp
index 281036cf703be..82d9cce9563e0 100644
--- a/clang/test/OpenMP/target_team_variable_codegen.cpp
+++ b/clang/test/OpenMP/target_team_variable_codegen.cpp
@@ -3,8 +3,8 @@
 
 
 // Test target codegen - host bc file has to be created first.
-// RUN: %clang_cc1 -verify -fopenmp -x c++ -triple powerpc64le-unknown-unknown 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm-bc %s -o %t-ppc-host-amd.bc
-// RUN: %clang_cc1 -verify -fopenmp -x c++ -triple amdgcn-amd-amdhsa 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s -fopenmp-target-debug 
-fopenmp-is-target-device -fopenmp-host-ir-file-path %t-ppc-host-amd.bc -o - | 
FileCheck %s --check-prefix=CHECK-AMD
+// RUN: %clang_cc1 -verify -fopenmp -x c++ -triple powerpc64le-unknown-unknown 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm-bc %s -o %t-ppc-host-amd.bc
+// RUN: %clang_cc1 -verify -fopenmp -x c++ -triple amdgpu-amd-amdhsa 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s -fopenmp-target-debug 
-fopenmp-is-target-device -fopenmp-host-ir-file-path %t-ppc-host-amd.bc -o - | 
FileCheck %s --check-prefix=CHECK-AMD
 
 // RUN: %clang_cc1 -verify -fopenmp -x c++ -triple powerpc64le-unknown-unknown 
-fopenmp-targets=nvptx64-nvidia-cuda -emit-llvm-bc %s -o %t-ppc-host-nvidia.bc
 // RUN: %clang_cc1 -verify -fopenmp -x c++ -triple nvptx64-unknown-unknown 
-fopenmp-targets=nvptx64-unknown-unknown -emit-llvm %s -fopenmp-target-debug 
-fopenmp-is-target-device -fopenmp-host-ir-file-path %t-ppc-host-nvidia.bc -o - 
| FileCheck %s --check-prefix=CHECK-NVIDIA
diff --git a/clang/test/OpenMP/target_teams_generic_loop_codegen.cpp 
b/clang/test/OpenMP/target_teams_generic_loop_codegen.cpp
index aacf464f056dc..6679f2211956a 100644
--- a/clang/test/OpenMP/target_teams_generic_loop_codegen.cpp
+++ b/clang/test/OpenMP/target_teams_generic_loop_codegen.cpp
@@ -1,8 +1,8 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py 
UTC_ARGS: --function-signature --include-generated-funcs --replace-value-regex 
"__omp_offloading_[0-9a-z]+_[0-9a-z]+" "reduction_size[.].+[.]" 
"pl_cond[.].+[.|,]" --prefix-filecheck-ir-name _
 // REQUIRES: amdgpu-registered-target
 
-// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm-bc %s -o %t-ppc-host.bc
-// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple amdgcn-amd-amdhsa 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck %s 
--check-prefix=IR-GPU
+// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm-bc %s -o %t-ppc-host.bc
+// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple amdgpu-amd-amdhsa 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck %s 
--check-prefix=IR-GPU
 
 // RUN: %clang_cc1 -verify -triple x86_64-pc-linux-gnu -fopenmp -emit-llvm %s 
-o - | FileCheck %s --check-prefix=IR
 
diff --git 
a/clang/test/OpenMP/target_teams_generic_loop_codegen_as_distribute.cpp 
b/clang/test/OpenMP/target_teams_generic_loop_codegen_as_distribute.cpp
index 3686ca7ea08e0..88d0d9b2f2fee 100644
--- a/clang/test/OpenMP/target_teams_generic_loop_codegen_as_distribute.cpp
+++ b/clang/test/OpenMP/target_teams_generic_loop_codegen_as_distribute.cpp
@@ -1,8 +1,8 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py 
UTC_ARGS: --include-generated-funcs --replace-value-regex 
"__omp_offloading_[0-9a-z]+_[0-9a-z]+" "reduction_size[.].+[.]" 
"pl_cond[.].+[.|,]" --prefix-filecheck-ir-name _ --version 2
 // REQUIRES: amdgpu-registered-target
 
-// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm-bc %s -o %t-ppc-host.bc
-// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple amdgcn-amd-amdhsa 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck %s 
--check-prefix=IR-GPU
+// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm-bc %s -o %t-ppc-host.bc
+// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple amdgpu-amd-amdhsa 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck %s 
--check-prefix=IR-GPU
 
 // RUN: %clang_cc1 -verify -triple x86_64-pc-linux-gnu -fopenmp -emit-llvm %s 
-o - | FileCheck %s --check-prefix=IR
 
diff --git 
a/clang/test/OpenMP/target_teams_generic_loop_codegen_as_parallel_for.cpp 
b/clang/test/OpenMP/target_teams_generic_loop_codegen_as_parallel_for.cpp
index 11ae386739b40..9bd38d7d03e50 100644
--- a/clang/test/OpenMP/target_teams_generic_loop_codegen_as_parallel_for.cpp
+++ b/clang/test/OpenMP/target_teams_generic_loop_codegen_as_parallel_for.cpp
@@ -1,8 +1,8 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py 
UTC_ARGS: --function-signature --include-generated-funcs --replace-value-regex 
"__omp_offloading_[0-9a-z]+_[0-9a-z]+" "reduction_size[.].+[.]" 
"pl_cond[.].+[.|,]" --prefix-filecheck-ir-name _
 // REQUIRES: amdgpu-registered-target
 
-// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm-bc %s -o %t-ppc-host.bc
-// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple amdgcn-amd-amdhsa 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck %s 
--check-prefix=IR-GPU
+// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm-bc %s -o %t-ppc-host.bc
+// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple amdgpu-amd-amdhsa 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-ppc-host.bc -o - | FileCheck %s 
--check-prefix=IR-GPU
 
 // RUN: %clang_cc1 -verify -triple x86_64-pc-linux-gnu -fopenmp -emit-llvm %s 
-o - | FileCheck %s --check-prefix=IR
 
@@ -11,8 +11,8 @@
 // RUN: %clang_cc1 -verify -triple x86_64-pc-linux-gnu -fopenmp -include-pch 
%t -emit-llvm %s -o - | FileCheck %s --check-prefix=IR-PCH
 
 
-// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgcn-amd-amdhsa -fopenmp-assume-no-nested-parallelism 
-DNESTED -emit-llvm-bc %s -o %t-ppc-host.bc
-// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple amdgcn-amd-amdhsa 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-assume-no-nested-parallelism -DNESTED -fopenmp-host-ir-file-path 
%t-ppc-host.bc -o - | FileCheck %s --check-prefix=IR-GPU-NESTED
+// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple x86_64-unknown-unknown 
-fopenmp-targets=amdgpu-amd-amdhsa -fopenmp-assume-no-nested-parallelism 
-DNESTED -emit-llvm-bc %s -o %t-ppc-host.bc
+// RUN: %clang_cc1 -fopenmp -x c++ -std=c++11 -triple amdgpu-amd-amdhsa 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-assume-no-nested-parallelism -DNESTED -fopenmp-host-ir-file-path 
%t-ppc-host.bc -o - | FileCheck %s --check-prefix=IR-GPU-NESTED
 
 // RUN: %clang_cc1 -verify -triple x86_64-pc-linux-gnu -fopenmp 
-fopenmp-assume-no-nested-parallelism -DNESTED -emit-llvm %s -o - | FileCheck 
%s --check-prefix=IR-NESTED
 
diff --git a/clang/test/OpenMP/target_update_count_expression_codegen.c 
b/clang/test/OpenMP/target_update_count_expression_codegen.c
index e11f043f3602f..86ebe4a8df505 100644
--- a/clang/test/OpenMP/target_update_count_expression_codegen.c
+++ b/clang/test/OpenMP/target_update_count_expression_codegen.c
@@ -1,11 +1,11 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py 
UTC_ARGS: --check-globals --include-generated-funcs --replace-value-regex 
"__omp_offloading_[0-9a-z]+_[0-9a-z]+" "reduction_size[.].+[.]" 
"pl_cond[.].+[.|,]" --prefix-filecheck-ir-name _ --global-value-regex 
"\.offload_.*" --global-hex-value-regex ".offload_maptypes.*" --version 3
 
-// RUN: %clang_cc1 -fopenmp -fopenmp-enable-irbuilder -x c -triple 
x86_64-unknown-unknown -fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s -o - \
+// RUN: %clang_cc1 -fopenmp -fopenmp-enable-irbuilder -x c -triple 
x86_64-unknown-unknown -fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s -o - \
 // RUN: | FileCheck %s
 
 // Check same results after serialization round-trip
-// RUN: %clang_cc1 -fopenmp -fopenmp-enable-irbuilder -x c -triple 
x86_64-unknown-unknown -fopenmp-targets=amdgcn-amd-amdhsa -emit-pch -o %t %s
-// RUN: %clang_cc1 -fopenmp -fopenmp-enable-irbuilder -x c -triple 
x86_64-unknown-unknown -fopenmp-targets=amdgcn-amd-amdhsa -include-pch %t 
-emit-llvm %s -o - \
+// RUN: %clang_cc1 -fopenmp -fopenmp-enable-irbuilder -x c -triple 
x86_64-unknown-unknown -fopenmp-targets=amdgpu-amd-amdhsa -emit-pch -o %t %s
+// RUN: %clang_cc1 -fopenmp -fopenmp-enable-irbuilder -x c -triple 
x86_64-unknown-unknown -fopenmp-targets=amdgpu-amd-amdhsa -include-pch %t 
-emit-llvm %s -o - \
 // RUN: | FileCheck %s
 
 // expected-no-diagnostics
diff --git a/clang/test/OpenMP/target_visibility.cpp 
b/clang/test/OpenMP/target_visibility.cpp
index b30f4e7ffd3c5..6ecbaa096e5de 100644
--- a/clang/test/OpenMP/target_visibility.cpp
+++ b/clang/test/OpenMP/target_visibility.cpp
@@ -1,5 +1,5 @@
 // RUN: %clang_cc1 -debug-info-kind=limited -verify -fopenmp -x c++ -triple 
nvptx64-unknown-unknown -fopenmp-targets=nvptx64-nvidia-cuda -emit-llvm %s 
-fopenmp-is-target-device -o - | FileCheck %s
-// RUN: %clang_cc1 -debug-info-kind=limited -verify -fopenmp -x c++ -triple 
amdgcn-amd-amdhsa -fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s 
-fopenmp-is-target-device -o - | FileCheck %s
+// RUN: %clang_cc1 -debug-info-kind=limited -verify -fopenmp -x c++ -triple 
amdgpu-amd-amdhsa -fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s 
-fopenmp-is-target-device -o - | FileCheck %s
 // RUN: %clang_cc1 -debug-info-kind=limited -verify -fopenmp -x c++ -triple 
spirv64 -fopenmp-targets=spirv64 -emit-llvm %s -fopenmp-is-target-device -o - | 
FileCheck %s
 // expected-no-diagnostics
 
diff --git a/clang/test/OpenMP/thread_limit_gpu.c 
b/clang/test/OpenMP/thread_limit_gpu.c
index c976e9e72b1ba..1716e16465eca 100644
--- a/clang/test/OpenMP/thread_limit_gpu.c
+++ b/clang/test/OpenMP/thread_limit_gpu.c
@@ -1,7 +1,7 @@
 // Test target codegen - host bc file has to be created first.
-// RUN: %clang_cc1 -verify -fopenmp -x c++ -triple x86_64-unknown-linux-gnu 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm-bc %s -o %t-x86-host.bc
-// RUN: %clang_cc1 -verify -fopenmp -x c++ -triple amdgcn-amd-amdhsa 
-fopenmp-targets=amdgcn-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-x86-host.bc -o - | FileCheck 
-check-prefixes=CHECK,CHECK-AMDGPU %s
-// RUN: %clang_cc1 -verify -fopenmp -x c++ -triple amdgcn-amd-amdhsa 
-fopenmp-targets=amdgcn-amd-amdhsa -mllvm 
-openmp-ir-builder-use-default-max-threads=false -emit-llvm %s 
-fopenmp-is-target-device -fopenmp-host-ir-file-path %t-x86-host.bc -o - | 
FileCheck -check-prefixes=CHECK,CHECK-AMDGPU-FLAG %s
+// RUN: %clang_cc1 -verify -fopenmp -x c++ -triple x86_64-unknown-linux-gnu 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm-bc %s -o %t-x86-host.bc
+// RUN: %clang_cc1 -verify -fopenmp -x c++ -triple amdgpu-amd-amdhsa 
-fopenmp-targets=amdgpu-amd-amdhsa -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-x86-host.bc -o - | FileCheck 
-check-prefixes=CHECK,CHECK-AMDGPU %s
+// RUN: %clang_cc1 -verify -fopenmp -x c++ -triple amdgpu-amd-amdhsa 
-fopenmp-targets=amdgpu-amd-amdhsa -mllvm 
-openmp-ir-builder-use-default-max-threads=false -emit-llvm %s 
-fopenmp-is-target-device -fopenmp-host-ir-file-path %t-x86-host.bc -o - | 
FileCheck -check-prefixes=CHECK,CHECK-AMDGPU-FLAG %s
 // RUN: %clang_cc1 -verify -fopenmp -x c++ -triple x86_64-unknown-linux-gnu 
-fopenmp-targets=spirv64-intel -emit-llvm-bc %s -o %t-x86-spirv-host.bc
 // RUN: %clang_cc1 -verify -fopenmp -x c++ -triple spirv64-intel 
-fopenmp-targets=spirv64-intel -emit-llvm %s -fopenmp-is-target-device 
-fopenmp-host-ir-file-path %t-x86-spirv-host.bc -o - | FileCheck 
-check-prefixes=CHECK,CHECK-SPIRV %s
 // RUN: %clang_cc1 -verify -fopenmp -x c++ -triple spirv64-intel 
-fopenmp-targets=spirv64-intel -mllvm 
-openmp-ir-builder-use-default-max-threads=false -emit-llvm %s 
-fopenmp-is-target-device -fopenmp-host-ir-file-path %t-x86-spirv-host.bc -o - 
| FileCheck -check-prefixes=CHECK,CHECK-SPIRV-FLAG %s
diff --git a/clang/test/SemaOpenMP/amdgpu-barrier.cpp 
b/clang/test/SemaOpenMP/amdgpu-barrier.cpp
index 70aaefd080885..f66443fdab488 100644
--- a/clang/test/SemaOpenMP/amdgpu-barrier.cpp
+++ b/clang/test/SemaOpenMP/amdgpu-barrier.cpp
@@ -1,5 +1,5 @@
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -verify -fopenmp -fopenmp-targets=amdgcn-amd-amdhsa -triple 
amdgcn-amd-amdhsa -fopenmp-is-target-device -Wno-unused-value %s
+// RUN: %clang_cc1 -verify -fopenmp -fopenmp-targets=amdgpu-amd-amdhsa -triple 
amdgpu-amd-amdhsa -fopenmp-is-target-device -Wno-unused-value %s
 
 void foo() {
 #pragma omp target
diff --git a/clang/test/SemaOpenMP/amdgpu-buffer-rsrc.cpp 
b/clang/test/SemaOpenMP/amdgpu-buffer-rsrc.cpp
index eb6ded229a75c..a63e06ac5a0ee 100644
--- a/clang/test/SemaOpenMP/amdgpu-buffer-rsrc.cpp
+++ b/clang/test/SemaOpenMP/amdgpu-buffer-rsrc.cpp
@@ -1,5 +1,5 @@
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -verify -fopenmp -fopenmp-targets=amdgcn-amd-amdhsa -triple 
amdgcn-amd-amdhsa -fopenmp-is-target-device -Wno-unused-value %s
+// RUN: %clang_cc1 -verify -fopenmp -fopenmp-targets=amdgpu-amd-amdhsa -triple 
amdgpu-amd-amdhsa -fopenmp-is-target-device -Wno-unused-value %s
 
 void foo() {
 #pragma omp target
diff --git a/clang/test/SemaOpenMP/amdgpu-image-rsrc.cpp 
b/clang/test/SemaOpenMP/amdgpu-image-rsrc.cpp
index 51b3f72d12e12..f86e8dbb6f2af 100644
--- a/clang/test/SemaOpenMP/amdgpu-image-rsrc.cpp
+++ b/clang/test/SemaOpenMP/amdgpu-image-rsrc.cpp
@@ -1,6 +1,6 @@
 // NOTE: Assertions have been autogenerated by utils/update_cc_test_checks.py 
UTC_ARGS: --version 5
 // REQUIRES: amdgpu-registered-target
-// RUN: %clang_cc1 -verify -fopenmp -fopenmp-targets=amdgcn-amd-amdhsa -triple 
amdgcn-amd-amdhsa -fopenmp-is-target-device -Wno-unused-value %s
+// RUN: %clang_cc1 -verify -fopenmp -fopenmp-targets=amdgpu-amd-amdhsa -triple 
amdgpu-amd-amdhsa -fopenmp-is-target-device -Wno-unused-value %s
 
 void foo() {
 #pragma omp target

_______________________________________________
llvm-branch-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits

[llvm-branch-commits] [clang] clang/AMDGPU: Migrate OpenMP cc1 tests to amdgpu triples (12) (PR #212051)

Reply via email to