From 5eabececb0a3c7e761ddda2e49430baa834f2c65 Mon Sep 17 00:00:00 2001 From: Joseph Huber Date: Fri, 18 Apr 2025 12:00:58 -0500 Subject: [PATCH] [Offload] Fix JIT test --- offload/test/jit/empty_kernel.inc | 6 +-- offload/test/jit/empty_kernel_lvl2.c | 71 ++-------------------------- 2 files changed, 5 insertions(+), 72 deletions(-) diff --git a/offload/test/jit/empty_kernel.inc b/offload/test/jit/empty_kernel.inc index 72de3c140c07..b4bf83fd2ec6 100644 --- a/offload/test/jit/empty_kernel.inc +++ b/offload/test/jit/empty_kernel.inc @@ -33,9 +33,7 @@ int main(int argc, char** argv) { } // Check for an empty kernel (IR level) -// FIRST: define weak_odr {{.*}} void @__omp_offloading_{{.*}}_main{{.*}} -// FIRST-NEXT: ret void +// FIRST: define weak_odr {{.*}} void @__omp_offloading_{{.*}}_main{{.*}} // Check for two empty kernels (IR level) -// SECOND: define weak_odr {{.*}} void @__omp_offloading_{{.*}}_main{{.*}} -// SECOND-NEXT: ret void +// SECOND: define weak_odr {{.*}} void @__omp_offloading_{{.*}}_main{{.*}} diff --git a/offload/test/jit/empty_kernel_lvl2.c b/offload/test/jit/empty_kernel_lvl2.c index 90e4ce321fe8..9e2ef17a42fb 100644 --- a/offload/test/jit/empty_kernel_lvl2.c +++ b/offload/test/jit/empty_kernel_lvl2.c @@ -1,12 +1,12 @@ // clang-format off -// RUN: %libomptarget-compileoptxx-generic -fopenmp-target-jit \ +// RUN: %libomptarget-compileopt-generic -fopenmp-target-jit \ // RUN: -DTGT1_DIRECTIVE="target" \ // RUN: -DLOOP_DIRECTIVE="for" // RUN: env LIBOMPTARGET_JIT_PRE_OPT_IR_MODULE=%t.pre.ll \ // RUN: LIBOMPTARGET_JIT_SKIP_OPT=true \ // RUN: %libomptarget-run-generic // RUN: %fcheck-plain-generic --input-file %t.pre.ll %S/empty_kernel.inc --check-prefix=FIRST -// RUN: %libomptarget-compileoptxx-generic -fopenmp-target-jit \ +// RUN: %libomptarget-compileopt-generic -fopenmp-target-jit \ // RUN: -DTGT1_DIRECTIVE="target" \ // RUN: -DTGT2_DIRECTIVE="target" \ // RUN: -DLOOP_DIRECTIVE="for" @@ -15,77 +15,12 @@ // RUN: %libomptarget-run-generic // RUN: %fcheck-plain-generic --input-file %t.pre.ll %S/empty_kernel.inc --check-prefixes=FIRST,SECOND // -// RUN: %libomptarget-compileoptxx-generic -fopenmp-target-jit \ +// RUN: %libomptarget-compileopt-generic -fopenmp-target-jit \ // RUN: -DTGT1_DIRECTIVE="target" \ // RUN: -DLOOP_DIRECTIVE="parallel for" // RUN: env LIBOMPTARGET_JIT_PRE_OPT_IR_MODULE=%t.pre.ll \ // RUN: LIBOMPTARGET_JIT_SKIP_OPT=true \ // RUN: %libomptarget-run-generic -// TODO: -// RUN: not %fcheck-plain-generic --input-file %t.pre.ll %S/empty_kernel.inc --check-prefix=FIRST -// RUN: %libomptarget-compileoptxx-generic -fopenmp-target-jit \ -// RUN: -DTGT1_DIRECTIVE="target" \ -// RUN: -DTGT2_DIRECTIVE="target teams" \ -// RUN: -DLOOP_DIRECTIVE="parallel for" -// RUN: env LIBOMPTARGET_JIT_PRE_OPT_IR_MODULE=%t.pre.ll \ -// RUN: LIBOMPTARGET_JIT_SKIP_OPT=true \ -// RUN: %libomptarget-run-generic -// TODO: -// RUN: not %fcheck-plain-generic --input-file %t.pre.ll %S/empty_kernel.inc --check-prefixes=FIRST,SECOND -// -// RUN: %libomptarget-compileoptxx-generic -fopenmp-target-jit \ -// RUN: -DTGT1_DIRECTIVE="target teams" \ -// RUN: -DLOOP_DIRECTIVE="distribute" -// RUN: env LIBOMPTARGET_JIT_PRE_OPT_IR_MODULE=%t.pre.ll \ -// RUN: LIBOMPTARGET_JIT_SKIP_OPT=true \ -// RUN: %libomptarget-run-generic -// TODO: -// RUN: not %fcheck-plain-generic --input-file %t.pre.ll %S/empty_kernel.inc --check-prefix=FIRST -// RUN: %libomptarget-compileoptxx-generic -fopenmp-target-jit \ -// RUN: -DTGT1_DIRECTIVE="target teams" \ -// RUN: -DTGT2_DIRECTIVE="target teams" \ -// RUN: -DLOOP_DIRECTIVE="distribute" -// RUN: env LIBOMPTARGET_JIT_PRE_OPT_IR_MODULE=%t.pre.ll \ -// RUN: LIBOMPTARGET_JIT_SKIP_OPT=true \ -// RUN: %libomptarget-run-generic -// TODO: -// RUN: not %fcheck-plain-generic --input-file %t.pre.ll %S/empty_kernel.inc --check-prefixes=FIRST,SECOND -// -// RUN: %libomptarget-compileoptxx-generic -fopenmp-target-jit \ -// RUN: -DTGT1_DIRECTIVE="target teams" \ -// RUN: -DLOOP_DIRECTIVE="distribute parallel for" -// RUN: env LIBOMPTARGET_JIT_PRE_OPT_IR_MODULE=%t.pre.ll \ -// RUN: LIBOMPTARGET_JIT_SKIP_OPT=true \ -// RUN: %libomptarget-run-generic -// TODO: -// RUN: not %fcheck-plain-generic --input-file %t.pre.ll %S/empty_kernel.inc --check-prefix=FIRST -// RUN: %libomptarget-compileoptxx-generic -fopenmp-target-jit \ -// RUN: -DTGT1_DIRECTIVE="target teams" \ -// RUN: -DTGT2_DIRECTIVE="target teams" \ -// RUN: -DLOOP_DIRECTIVE="distribute parallel for" -// RUN: env LIBOMPTARGET_JIT_PRE_OPT_IR_MODULE=%t.pre.ll \ -// RUN: LIBOMPTARGET_JIT_SKIP_OPT=true \ -// RUN: %libomptarget-run-generic -// TODO: -// RUN: not %fcheck-plain-generic --input-file %t.pre.ll %S/empty_kernel.inc --check-prefixes=FIRST,SECOND -// -// RUN: %libomptarget-compileoptxx-generic -fopenmp-target-jit \ -// RUN: -DTGT1_DIRECTIVE="target teams" \ -// RUN: -DLOOP_DIRECTIVE="distribute parallel for simd" -// RUN: env LIBOMPTARGET_JIT_PRE_OPT_IR_MODULE=%t.pre.ll \ -// RUN: LIBOMPTARGET_JIT_SKIP_OPT=true \ -// RUN: %libomptarget-run-generic -// TODO: -// RUN: not %fcheck-plain-generic --input-file %t.pre.ll %S/empty_kernel.inc --check-prefix=FIRST -// RUN: %libomptarget-compileoptxx-generic -fopenmp-target-jit \ -// RUN: -DTGT1_DIRECTIVE="target teams" \ -// RUN: -DTGT2_DIRECTIVE="target teams" \ -// RUN: -DLOOP_DIRECTIVE="distribute parallel for simd" -// RUN: env LIBOMPTARGET_JIT_PRE_OPT_IR_MODULE=%t.pre.ll \ -// RUN: LIBOMPTARGET_JIT_SKIP_OPT=true \ -// RUN: %libomptarget-run-generic -// TODO: -// RUN: not %fcheck-plain-generic --input-file %t.pre.ll %S/empty_kernel.inc --check-prefixes=FIRST,SECOND // clang-format on // REQUIRES: gpu