[llvm] [offload] Adapt tests to new PluginInterface quoting [NFC] (PR #180505)
Robert Imschweiler via llvm-commits
llvm-commits at lists.llvm.org
Mon Feb 9 03:34:34 PST 2026
https://github.com/ro-i updated https://github.com/llvm/llvm-project/pull/180505
>From 371c70e3f8bc0c0e9b8186c296ad2e8a8c35caf8 Mon Sep 17 00:00:00 2001
From: Robert Imschweiler <robert.imschweiler at amd.com>
Date: Mon, 9 Feb 2026 05:05:32 -0600
Subject: [PATCH 1/2] [offload] Adapt tests to new PluginInterface quoting
[NFC]
https://github.com/llvm/llvm-project/commit/4096cb60175a3bfdde25dd0cca167416f4f4338e
removed the quotes around PluginInterface
---
.../offloading/fortran/basic-target-parallel-do.f90 | 2 +-
.../fortran/basic-target-parallel-reduction.f90 | 2 +-
.../basic-target-teams-parallel-reduction.f90 | 2 +-
.../fortran/default-mapper-nested-derived-type.f90 | 2 +-
.../fortran/do-concurrent-to-omp-saxpy-2d.f90 | 2 +-
.../fortran/do-concurrent-to-omp-saxpy.f90 | 2 +-
.../explicit-and-implicit-record-field-mapping.f90 | 2 +-
.../fortran/implicit-record-field-mapping.f90 | 2 +-
.../fortran/target-custom-reduction-derivedtype.f90 | 2 +-
offload/test/offloading/fortran/target-no-loop.f90 | 12 ++++++------
.../fortran/target-parallel-do-collapse.f90 | 2 +-
offload/test/offloading/ompx_bare.c | 2 +-
offload/test/offloading/ompx_bare_multi_dim.cpp | 2 +-
13 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/offload/test/offloading/fortran/basic-target-parallel-do.f90 b/offload/test/offloading/fortran/basic-target-parallel-do.f90
index f97d4085ac395..ee86b69a279f3 100644
--- a/offload/test/offloading/fortran/basic-target-parallel-do.f90
+++ b/offload/test/offloading/fortran/basic-target-parallel-do.f90
@@ -25,5 +25,5 @@ program main
end program main
-! CHECK: "PluginInterface" device {{[0-9]+}} info: Launching kernel {{.*}}
+! CHECK: PluginInterface device {{[0-9]+}} info: Launching kernel {{.*}}
! CHECK: number of errors: 0
diff --git a/offload/test/offloading/fortran/basic-target-parallel-reduction.f90 b/offload/test/offloading/fortran/basic-target-parallel-reduction.f90
index cb84bcd3462cf..5300eb0df49c6 100644
--- a/offload/test/offloading/fortran/basic-target-parallel-reduction.f90
+++ b/offload/test/offloading/fortran/basic-target-parallel-reduction.f90
@@ -23,5 +23,5 @@ program main
end program main
-! CHECK: "PluginInterface" device {{[0-9]+}} info: Launching kernel {{.*}}
+! CHECK: PluginInterface device {{[0-9]+}} info: Launching kernel {{.*}}
! CHECK: number of errors: 0
diff --git a/offload/test/offloading/fortran/basic-target-teams-parallel-reduction.f90 b/offload/test/offloading/fortran/basic-target-teams-parallel-reduction.f90
index fab4950452478..496449dc714ae 100644
--- a/offload/test/offloading/fortran/basic-target-teams-parallel-reduction.f90
+++ b/offload/test/offloading/fortran/basic-target-teams-parallel-reduction.f90
@@ -23,5 +23,5 @@ program main
end program main
-! CHECK: "PluginInterface" device {{[0-9]+}} info: Launching kernel {{.*}}
+! CHECK: PluginInterface device {{[0-9]+}} info: Launching kernel {{.*}}
! CHECK: number of errors: 0
diff --git a/offload/test/offloading/fortran/default-mapper-nested-derived-type.f90 b/offload/test/offloading/fortran/default-mapper-nested-derived-type.f90
index 5d69fa072fd63..e54110f7e5d60 100644
--- a/offload/test/offloading/fortran/default-mapper-nested-derived-type.f90
+++ b/offload/test/offloading/fortran/default-mapper-nested-derived-type.f90
@@ -31,4 +31,4 @@ program test_omp_target_map_bug_v5
deallocate(config%derived_field%alloc_field)
end program test_omp_target_map_bug_v5
-! CHECK: "PluginInterface" device {{[0-9]+}} info: Launching kernel {{.*}}
+! CHECK: PluginInterface device {{[0-9]+}} info: Launching kernel {{.*}}
diff --git a/offload/test/offloading/fortran/do-concurrent-to-omp-saxpy-2d.f90 b/offload/test/offloading/fortran/do-concurrent-to-omp-saxpy-2d.f90
index c6f576acb90b6..2f1526c126e97 100644
--- a/offload/test/offloading/fortran/do-concurrent-to-omp-saxpy-2d.f90
+++ b/offload/test/offloading/fortran/do-concurrent-to-omp-saxpy-2d.f90
@@ -47,7 +47,7 @@ program main
deallocate(x,y)
end program main
-! CHECK: "PluginInterface" device {{[0-9]+}} info: Launching kernel {{.*}}
+! CHECK: PluginInterface device {{[0-9]+}} info: Launching kernel {{.*}}
! CHECK: plausibility check:
! CHECK: y(1,1) 4.0
! CHECK: y(n,m) 4.0
diff --git a/offload/test/offloading/fortran/do-concurrent-to-omp-saxpy.f90 b/offload/test/offloading/fortran/do-concurrent-to-omp-saxpy.f90
index e094a1d7459ef..91eedd3afae3c 100644
--- a/offload/test/offloading/fortran/do-concurrent-to-omp-saxpy.f90
+++ b/offload/test/offloading/fortran/do-concurrent-to-omp-saxpy.f90
@@ -47,7 +47,7 @@ program main
deallocate(x,y)
end program main
-! CHECK: "PluginInterface" device {{[0-9]+}} info: Launching kernel {{.*}}
+! CHECK: PluginInterface device {{[0-9]+}} info: Launching kernel {{.*}}
! CHECK: plausibility check:
! CHECK: y(1) 4.0
! CHECK: y(n) 4.0
diff --git a/offload/test/offloading/fortran/explicit-and-implicit-record-field-mapping.f90 b/offload/test/offloading/fortran/explicit-and-implicit-record-field-mapping.f90
index b619774514b2c..6ec9ffd0264bf 100644
--- a/offload/test/offloading/fortran/explicit-and-implicit-record-field-mapping.f90
+++ b/offload/test/offloading/fortran/explicit-and-implicit-record-field-mapping.f90
@@ -79,5 +79,5 @@ program reproducer
print *, "======= Test Passed! ======="
end program reproducer
-! CHECK: "PluginInterface" device {{[0-9]+}} info: Launching kernel {{.*}}
+! CHECK: PluginInterface device {{[0-9]+}} info: Launching kernel {{.*}}
! CHECK: ======= Test Passed! =======
diff --git a/offload/test/offloading/fortran/implicit-record-field-mapping.f90 b/offload/test/offloading/fortran/implicit-record-field-mapping.f90
index 29894941c424b..9c93ee0166e25 100644
--- a/offload/test/offloading/fortran/implicit-record-field-mapping.f90
+++ b/offload/test/offloading/fortran/implicit-record-field-mapping.f90
@@ -48,5 +48,5 @@ program test_implicit_field_mapping
endif
end program
-! CHECK: "PluginInterface" device {{[0-9]+}} info: Launching kernel {{.*}}
+! CHECK: PluginInterface device {{[0-9]+}} info: Launching kernel {{.*}}
! CHECK: Test succeeded!
diff --git a/offload/test/offloading/fortran/target-custom-reduction-derivedtype.f90 b/offload/test/offloading/fortran/target-custom-reduction-derivedtype.f90
index cc390cf0881f3..c0aaa357eb746 100644
--- a/offload/test/offloading/fortran/target-custom-reduction-derivedtype.f90
+++ b/offload/test/offloading/fortran/target-custom-reduction-derivedtype.f90
@@ -83,6 +83,6 @@ program main
end program main
-! CHECK: "PluginInterface" device {{[0-9]+}} info: Launching kernel {{.*}}
+! CHECK: PluginInterface device {{[0-9]+}} info: Launching kernel {{.*}}
! CHECK: PASSED
diff --git a/offload/test/offloading/fortran/target-no-loop.f90 b/offload/test/offloading/fortran/target-no-loop.f90
index 0cebfbc008b54..93b4a1bba7bc6 100644
--- a/offload/test/offloading/fortran/target-no-loop.f90
+++ b/offload/test/offloading/fortran/target-no-loop.f90
@@ -82,17 +82,17 @@ program main
end program main
-! CHECK: "PluginInterface" device {{[0-9]+}} info: Launching kernel {{.*}} SPMD-No-Loop mode
+! CHECK: PluginInterface device {{[0-9]+}} info: Launching kernel {{.*}} SPMD-No-Loop mode
! CHECK: info: #Args: 3 Teams x Thrds: 64x 16
-! CHECK: "PluginInterface" device {{[0-9]+}} info: Launching kernel {{.*}} SPMD mode
+! CHECK: PluginInterface device {{[0-9]+}} info: Launching kernel {{.*}} SPMD mode
! CHECK: info: #Args: 3 Teams x Thrds: 3x 16 {{.*}}
-! CHECK: "PluginInterface" device {{[0-9]+}} info: Launching kernel {{.*}} SPMD-No-Loop mode
+! CHECK: PluginInterface device {{[0-9]+}} info: Launching kernel {{.*}} SPMD-No-Loop mode
! CHECK: info: #Args: 3 Teams x Thrds: 64x 16 {{.*}}
-! CHECK: "PluginInterface" device {{[0-9]+}} info: Launching kernel {{.*}} SPMD mode
+! CHECK: PluginInterface device {{[0-9]+}} info: Launching kernel {{.*}} SPMD mode
! CHECK: info: #Args: 3 Teams x Thrds: 1x 16
-! CHECK: "PluginInterface" device {{[0-9]+}} info: Launching kernel {{.*}} Generic mode
+! CHECK: PluginInterface device {{[0-9]+}} info: Launching kernel {{.*}} Generic mode
! CHECK: info: #Args: 3 Teams x Thrds: 16x 16 {{.*}}
-! CHECK: "PluginInterface" device {{[0-9]+}} info: Launching kernel {{.*}} SPMD mode
+! CHECK: PluginInterface device {{[0-9]+}} info: Launching kernel {{.*}} SPMD mode
! CHECK: info: #Args: 4 Teams x Thrds: 16x 16 {{.*}}
! CHECK: number of errors: 0
diff --git a/offload/test/offloading/fortran/target-parallel-do-collapse.f90 b/offload/test/offloading/fortran/target-parallel-do-collapse.f90
index d68ea944484c4..619ba340d5f27 100644
--- a/offload/test/offloading/fortran/target-parallel-do-collapse.f90
+++ b/offload/test/offloading/fortran/target-parallel-do-collapse.f90
@@ -34,6 +34,6 @@ program main
end program main
-! CHECK: "PluginInterface" device {{[0-9]+}} info: Launching kernel {{.*}}
+! CHECK: PluginInterface device {{[0-9]+}} info: Launching kernel {{.*}}
! CHECK: number of errors: 0
diff --git a/offload/test/offloading/ompx_bare.c b/offload/test/offloading/ompx_bare.c
index 9589d72de3cd8..b1252105abff0 100644
--- a/offload/test/offloading/ompx_bare.c
+++ b/offload/test/offloading/ompx_bare.c
@@ -16,7 +16,7 @@ int main(int argc, char *argv[]) {
const int N = num_blocks * block_size;
int *data = (int *)malloc(N * sizeof(int));
- // CHECK: "PluginInterface" device 0 info: Launching kernel __omp_offloading_{{.*}} with [64,1,1] blocks and [64,1,1] threads in BARE mode
+ // CHECK: PluginInterface device 0 info: Launching kernel __omp_offloading_{{.*}} with [64,1,1] blocks and [64,1,1] threads in BARE mode
#pragma omp target teams ompx_bare num_teams(num_blocks) thread_limit(block_size) map(from: data[0:N])
{
diff --git a/offload/test/offloading/ompx_bare_multi_dim.cpp b/offload/test/offloading/ompx_bare_multi_dim.cpp
index 924810a44b076..5cb42aab606ff 100644
--- a/offload/test/offloading/ompx_bare_multi_dim.cpp
+++ b/offload/test/offloading/ompx_bare_multi_dim.cpp
@@ -10,7 +10,7 @@
#include <cassert>
#include <vector>
-// CHECK: "PluginInterface" device 0 info: Launching kernel __omp_offloading_{{.*}} with [2,4,6] blocks and [32,4,2] threads in BARE mode
+// CHECK: PluginInterface device 0 info: Launching kernel __omp_offloading_{{.*}} with [2,4,6] blocks and [32,4,2] threads in BARE mode
int main(int argc, char *argv[]) {
int bs[3] = {32u, 4u, 2u};
>From de457a61842c76066f9dc12c9ccf992d4e300b3b Mon Sep 17 00:00:00 2001
From: Robert Imschweiler <robert.imschweiler at amd.com>
Date: Mon, 9 Feb 2026 05:34:08 -0600
Subject: [PATCH 2/2] fix formatting
---
offload/test/offloading/ompx_bare.c | 4 +++-
offload/test/offloading/ompx_bare_multi_dim.cpp | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/offload/test/offloading/ompx_bare.c b/offload/test/offloading/ompx_bare.c
index b1252105abff0..432e4359ed161 100644
--- a/offload/test/offloading/ompx_bare.c
+++ b/offload/test/offloading/ompx_bare.c
@@ -16,7 +16,9 @@ int main(int argc, char *argv[]) {
const int N = num_blocks * block_size;
int *data = (int *)malloc(N * sizeof(int));
- // CHECK: PluginInterface device 0 info: Launching kernel __omp_offloading_{{.*}} with [64,1,1] blocks and [64,1,1] threads in BARE mode
+ // CHECK: PluginInterface device 0 info: Launching kernel
+ // CHECK-SAME: __omp_offloading_{{.*}} with [64,1,1] blocks and [64,1,1]
+ // CHECK-SAME: threads in BARE mode
#pragma omp target teams ompx_bare num_teams(num_blocks) thread_limit(block_size) map(from: data[0:N])
{
diff --git a/offload/test/offloading/ompx_bare_multi_dim.cpp b/offload/test/offloading/ompx_bare_multi_dim.cpp
index 5cb42aab606ff..46d5f03b44692 100644
--- a/offload/test/offloading/ompx_bare_multi_dim.cpp
+++ b/offload/test/offloading/ompx_bare_multi_dim.cpp
@@ -10,7 +10,9 @@
#include <cassert>
#include <vector>
-// CHECK: PluginInterface device 0 info: Launching kernel __omp_offloading_{{.*}} with [2,4,6] blocks and [32,4,2] threads in BARE mode
+// CHECK: PluginInterface device 0 info: Launching kernel
+// CHECK-SAME: __omp_offloading_{{.*}} with [2,4,6] blocks and [32,4,2] threads
+// CHECK-SAME: in BARE mode
int main(int argc, char *argv[]) {
int bs[3] = {32u, 4u, 2u};
More information about the llvm-commits
mailing list