[OpenMP] OpenMP Clang tests without 50 version string after upgrading to 5.0

[saiislam]

Summary

Follow up of D81098 to ensure that no test silently fails during
next OpenMP version bump. This patch removes all occurrences of
-fopenmp-version=50 from all test files.

Any future commits causing divergent behavior from 5.0 may
use version string for tagging version specific behavior while
keeping test for default version without version string.

[saiislam]

[Work in progress] 48 files inspected/corrected. Following 35 are yet to be checked:

clang/test/OpenMP/target_parallel_depend_messages.cpp (26 lines)
clang/test/OpenMP/target_parallel_for_depend_messages.cpp (53 lines)
clang/test/OpenMP/target_parallel_for_map_messages.cpp (17 lines)
clang/test/OpenMP/target_parallel_for_simd_depend_messages.cpp (53 lines)
clang/test/OpenMP/target_parallel_for_simd_is_device_ptr_messages.cpp (15 lines)
clang/test/OpenMP/target_parallel_for_simd_map_messages.cpp (17 lines)
clang/test/OpenMP/target_parallel_is_device_ptr_messages.cpp (10 lines)
clang/test/OpenMP/target_parallel_map_messages.cpp (14 lines)
clang/test/OpenMP/target_simd_depend_codegen.cpp (12 lines)
clang/test/OpenMP/target_simd_depend_messages.cpp (53 lines)
clang/test/OpenMP/target_simd_map_messages.cpp (17 lines)
clang/test/OpenMP/target_teams_depend_messages.cpp (22 lines)
clang/test/OpenMP/target_teams_distribute_depend_messages.cpp (33 lines)
clang/test/OpenMP/target_teams_distribute_map_messages.cpp (17 lines)
clang/test/OpenMP/target_teams_distribute_parallel_for_depend_messages.cpp (42 lines)
clang/test/OpenMP/target_teams_distribute_parallel_for_is_device_ptr_messages.cpp (10 lines)
clang/test/OpenMP/target_teams_distribute_parallel_for_map_messages.cpp (13 lines)
clang/test/OpenMP/target_teams_distribute_parallel_for_schedule_codegen.cpp (48 lines)
clang/test/OpenMP/target_teams_distribute_parallel_for_simd_depend_messages.cpp (42 lines)
clang/test/OpenMP/target_teams_distribute_parallel_for_simd_firstprivate_messages.cpp (11 lines)
clang/test/OpenMP/target_teams_distribute_parallel_for_simd_is_device_ptr_messages.cpp (11 lines)
clang/test/OpenMP/target_teams_distribute_parallel_for_simd_map_messages.cpp (14 lines)
clang/test/OpenMP/target_teams_distribute_parallel_for_simd_schedule_codegen.cpp (48 lines)
clang/test/OpenMP/target_teams_distribute_simd_depend_codegen.cpp (99 lines)
clang/test/OpenMP/target_teams_distribute_simd_depend_messages.cpp (33 lines)
clang/test/OpenMP/target_teams_distribute_simd_is_device_ptr_messages.cpp (14 lines)
clang/test/OpenMP/target_teams_distribute_simd_loop_messages.cpp (34 lines)
clang/test/OpenMP/target_teams_distribute_simd_map_messages.cpp (17 lines)
clang/test/OpenMP/target_teams_is_device_ptr_messages.cpp (14 lines)
clang/test/OpenMP/target_update_depend_messages.cpp (131 lines)
clang/test/OpenMP/teams_distribute_parallel_for_schedule_codegen.cpp (48 lines)
clang/test/OpenMP/teams_distribute_parallel_for_simd_firstprivate_messages.cpp (11 lines)
clang/test/OpenMP/teams_distribute_parallel_for_simd_schedule_codegen.cpp (44 lines)
clang/test/OpenMP/teams_distribute_simd_firstprivate_messages.cpp (10 lines)
clang/test/OpenMP/threadprivate_codegen.cpp (330 lines)

[saiislam]

Instead of adding additional test cases without version string, removed all occurrences of -fopenmp-version=50.

[ABataev]

Check that default tests have additional -fopenmp-version=45 flag since they are expected to be executed in OpenMP 4.5 mode.

clang/test/OpenMP/declare_target_ast_print.cpp

5–7 ↗

(On Diff #278079)

Previous RUN lines miss -fopenmp-version=45

clang/test/OpenMP/distribute_codegen.cpp

14 ↗

(On Diff #278079)

Previous RUN lines miss -fopenmp-version=45

24–29 ↗

(On Diff #278079)

Previous RUN lines miss -fopenmp-version=45

clang/test/OpenMP/distribute_simd_codegen.cpp

2–7 ↗

(On Diff #278079)

Missed -fopenmp-version=45

[saiislam]

Abandoning in favor of D85214

clang/test/OpenMP/declare_target_codegen.cpp

 // RUN: %clang_cc1 -verify -fopenmp -fopenmp-version=45 -x c++ -triple powerpc64le-unknown-unknown -fopenmp-targets=powerpc64le-ibm-linux-gnu -emit-llvm-bc %s -o %t-ppc-host.bc -DLOAD
 // RUN: %clang_cc1 -verify -fopenmp -fopenmp-version=45 -x c++ -triple powerpc64le-unknown-unknown -emit-llvm %s -fopenmp-is-device -fopenmp-host-ir-file-path %t-ppc-host.bc -o - -DLOAD | FileCheck %s
 // RUN: %clang_cc1 -verify -fopenmp -fopenmp-version=45 -x c++ -triple powerpc64le-unknown-unknown -emit-llvm %s -fopenmp-is-device -fopenmp-host-ir-file-path %t-ppc-host.bc -emit-pch -o %t
 // RUN: %clang_cc1 -verify -fopenmp -fopenmp-version=45 -x c++ -triple powerpc64le-unknown-unknown -emit-llvm %s -fopenmp-is-device -fopenmp-host-ir-file-path %t-ppc-host.bc -include-pch %t -o - -DLOAD | FileCheck %s
 
-// RUN: %clang_cc1 -verify -fopenmp -x c++ -triple powerpc64le-unknown-unknown -fopenmp-targets=powerpc64le-ibm-linux-gnu -emit-llvm %s -o - -fopenmp-version=50 -DOMP5 | FileCheck %s --check-prefix HOST5
-// RUN: %clang_cc1 -verify -fopenmp -x c++ -triple powerpc64le-unknown-unknown -fopenmp-targets=powerpc64le-ibm-linux-gnu -emit-llvm-bc %s -o %t-ppc-host.bc -fopenmp-version=50 -DOMP5
-// RUN: %clang_cc1 -verify -fopenmp -x c++ -triple powerpc64le-unknown-unknown -emit-llvm %s -fopenmp-is-device -fopenmp-host-ir-file-path %t-ppc-host.bc -o - -fopenmp-version=50 -DOMP5 | FileCheck %s --check-prefix DEV5
-
-// RUN: %clang_cc1 -verify -fopenmp -x c++ -triple powerpc64le-unknown-unknown -emit-llvm %s -o - -fopenmp-version=50 -DOMP5 | FileCheck %s --check-prefix KMPC-ONLY
-
-// RUN: %clang_cc1 -verify -fopenmp-simd -x c++ -triple powerpc64le-unknown-unknown -fopenmp-targets=powerpc64le-ibm-linux-gnu -emit-llvm %s -o - -fopenmp-version=50 -DOMP5 | FileCheck %s --check-prefix SIMD-ONLY
-// RUN: %clang_cc1 -verify -fopenmp-simd -x c++ -triple powerpc64le-unknown-unknown -fopenmp-targets=powerpc64le-ibm-linux-gnu -emit-llvm-bc %s -o %t-ppc-host.bc -fopenmp-version=50 -DOMP5
-// RUN: %clang_cc1 -verify -fopenmp-simd -x c++ -triple powerpc64le-unknown-unknown -emit-llvm %s -fopenmp-is-device -fopenmp-host-ir-file-path %t-ppc-host.bc -o - -fopenmp-version=50 -DOMP5 | FileCheck %s --check-prefix SIMD-ONLY
+// RUN: %clang_cc1 -verify -fopenmp -x c++ -triple powerpc64le-unknown-unknown -fopenmp-targets=powerpc64le-ibm-linux-gnu -emit-llvm %s -o - -fopenmp-version=50 -DOMP5plus | FileCheck %s --check-prefix HOST5
+// RUN: %clang_cc1 -verify -fopenmp -x c++ -triple powerpc64le-unknown-unknown -fopenmp-targets=powerpc64le-ibm-linux-gnu -emit-llvm-bc %s -o %t-ppc-host.bc -fopenmp-version=50 -DOMP5plus
+// RUN: %clang_cc1 -verify -fopenmp -x c++ -triple powerpc64le-unknown-unknown -emit-llvm %s -fopenmp-is-device -fopenmp-host-ir-file-path %t-ppc-host.bc -o - -fopenmp-version=50 -DOMP5plus | FileCheck %s --check-prefix DEV5
+
+// RUN: %clang_cc1 -verify -fopenmp -x c++ -triple powerpc64le-unknown-unknown -emit-llvm %s -o - -fopenmp-version=50 -DOMP5plus | FileCheck %s --check-prefix KMPC-ONLY
+
+// RUN: %clang_cc1 -verify -fopenmp-simd -x c++ -triple powerpc64le-unknown-unknown -fopenmp-targets=powerpc64le-ibm-linux-gnu -emit-llvm %s -o - -fopenmp-version=50 -DOMP5plus | FileCheck %s --check-prefix SIMD-ONLY
+// RUN: %clang_cc1 -verify -fopenmp-simd -x c++ -triple powerpc64le-unknown-unknown -fopenmp-targets=powerpc64le-ibm-linux-gnu -emit-llvm-bc %s -o %t-ppc-host.bc -fopenmp-version=50 -DOMP5plus
+// RUN: %clang_cc1 -verify -fopenmp-simd -x c++ -triple powerpc64le-unknown-unknown -emit-llvm %s -fopenmp-is-device -fopenmp-host-ir-file-path %t-ppc-host.bc -o - -fopenmp-version=50 -DOMP5plus | FileCheck %s --check-prefix SIMD-ONLY
 
 // RUN: %clang_cc1 -verify -fopenmp-simd -x c++ -triple powerpc64le-unknown-unknown -fopenmp-targets=powerpc64le-ibm-linux-gnu -emit-llvm-bc %s -o %t-ppc-host.bc -fopenmp-version=45
 // RUN: %clang_cc1 -verify -fopenmp-simd -x c++ -triple powerpc64le-unknown-unknown -emit-llvm %s -fopenmp-is-device -fopenmp-host-ir-file-path %t-ppc-host.bc -o - -fopenmp-version=45 | FileCheck %s --check-prefix SIMD-ONLY
 // RUN: %clang_cc1 -verify -fopenmp-simd -x c++ -triple powerpc64le-unknown-unknown -emit-llvm %s -fopenmp-is-device -fopenmp-host-ir-file-path %t-ppc-host.bc -emit-pch -o %t -fopenmp-version=45
 // RUN: %clang_cc1 -verify -fopenmp-simd -x c++ -triple powerpc64le-unknown-unknown -emit-llvm %s -fopenmp-is-device -fopenmp-host-ir-file-path %t-ppc-host.bc -include-pch %t -verify -o - -fopenmp-version=45 | FileCheck %s --check-prefix SIMD-ONLY
 
+//
+// Additional tests without version string. To be updated with each OpenMP version change in case of changed behaviour.
+//
+
+// RUN: %clang_cc1 -verify -fopenmp -x c++ -triple powerpc64le-unknown-unknown -fopenmp-targets=powerpc64le-ibm-linux-gnu -emit-llvm %s -o - -DOMP5plus | FileCheck %s --check-prefix HOST5
+// RUN: %clang_cc1 -verify -fopenmp -x c++ -triple powerpc64le-unknown-unknown -fopenmp-targets=powerpc64le-ibm-linux-gnu -emit-llvm-bc %s -o %t-ppc-host.bc -DOMP5plus
+// RUN: %clang_cc1 -verify -fopenmp -x c++ -triple powerpc64le-unknown-unknown -emit-llvm %s -fopenmp-is-device -fopenmp-host-ir-file-path %t-ppc-host.bc -o - -DOMP5plus | FileCheck %s --check-prefix DEV5
+
+// RUN: %clang_cc1 -verify -fopenmp -x c++ -triple powerpc64le-unknown-unknown -emit-llvm %s -o - -DOMP5plus | FileCheck %s --check-prefix KMPC-ONLY
+
+// RUN: %clang_cc1 -verify -fopenmp-simd -x c++ -triple powerpc64le-unknown-unknown -fopenmp-targets=powerpc64le-ibm-linux-gnu -emit-llvm %s -o - -DOMP5plus | FileCheck %s --check-prefix SIMD-ONLY
+// RUN: %clang_cc1 -verify -fopenmp-simd -x c++ -triple powerpc64le-unknown-unknown -fopenmp-targets=powerpc64le-ibm-linux-gnu -emit-llvm-bc %s -o %t-ppc-host.bc -DOMP5plus
+// RUN: %clang_cc1 -verify -fopenmp-simd -x c++ -triple powerpc64le-unknown-unknown -emit-llvm %s -fopenmp-is-device -fopenmp-host-ir-file-path %t-ppc-host.bc -o - -DOMP5plus | FileCheck %s --check-prefix SIMD-ONLY
+
 // expected-no-diagnostics
 
 // SIMD-ONLY-NOT: {{__kmpc|__tgt}}
 // KMPC-ONLY-NOT: __tgt
 
 // CHECK-NOT: define {{.*}}{{baz1|baz4|maini1|Base|virtual_}}
 // CHECK-DAG: Bake
 // CHECK-NOT: @{{hhh|ggg|fff|eee}} =

 
 extern int eee;
 int fff = 0;
 extern int ggg;
 int hhh = 0;
 #pragma omp declare target link(eee, fff, ggg, hhh)
 
 int out_decl_target = 0;
-#ifdef OMP5
+#ifdef OMP5plus
 #pragma omp declare target(out_decl_target)
 #endif
 
 #pragma omp declare target
 void lambda () {
 #ifdef __cpp_lambdas
   (void)[&] { (void)out_decl_target; };
 #else

 // CHECK-DAG: declare extern_weak signext i32 @__create()
 
 // CHECK-NOT: define {{.*}}{{baz1|baz4|maini1|Base|virtual_}}
 
 // CHECK-DAG: !{i32 1, !"aaa", i32 0, i32 {{[0-9]+}}}
 // CHECK-DAG: !{i32 1, !"ccc", i32 0, i32 {{[0-9]+}}}
 // CHECK-DAG: !{{{.+}}virtual_foo
 
-#ifdef OMP5
+#ifdef OMP5plus
 void host_fun() {}
 #pragma omp declare target to(host_fun) device_type(host)
 void device_fun() {}
 #pragma omp declare target to(device_fun) device_type(nohost)
 // HOST5-NOT: define {{.*}}void {{.*}}device_fun{{.*}}
 // HOST5: define {{.*}}void {{.*}}host_fun{{.*}}
 // HOST5-NOT: define {{.*}}void {{.*}}device_fun{{.*}}
 
 // DEV5-NOT: define {{.*}}void {{.*}}host_fun{{.*}}
 // DEV5: define {{.*}}void {{.*}}device_fun{{.*}}
 // DEV5-NOT: define {{.*}}void {{.*}}host_fun{{.*}}
-#endif // OMP5
+#endif // OMP5plus
 
 #endif // HEADER
 
 #ifdef LOAD
 #pragma omp declare target
 void new_bar1() {
   TTT<int> *X = new TTT<int>();
   X->emitted();
 }
 #pragma omp end declare target
 #endif