This is an archive of the discontinued LLVM Phabricator instance.

Differential D150623

[OpenMP] Add JIT and IR tests
ClosedPublic

Authored by jdoerfert on May 15 2023, 3:44 PM.

Details

Reviewers
jhuber6
tianshilei1992
JonChesterfield
ye-luo
Commits
rGbda72457a84a: [OpenMP] Add JIT and IR tests
Summary

The OpenMP target JIT needs testing, so does the IR we actually generate
for the device. This is the initial commit with variations of an "empty
OpenMP kernel" that should all result in a empty IR kernel.

Diff Detail

Event Timeline

jdoerfert created this revision.May 15 2023, 3:44 PM
Herald added a project: Restricted Project. · View Herald TranscriptMay 15 2023, 3:44 PM
Herald added subscribers: sunshaoce, guansong, bollu, yaxunl. · View Herald Transcript
jdoerfert requested review of this revision.May 15 2023, 3:44 PM
Herald added subscribers: jplehr, sstefan1. · View Herald TranscriptMay 15 2023, 3:44 PM
tianshilei1992 added inline comments.May 15 2023, 3:47 PM
openmp/libomptarget/test/jit/empty_kernel_target.c
5 ↗(On Diff #522373)

cat doesn't look the right way. Wonder if FileCheck allows the input to be from a file.

Harbormaster completed remote builds in B232146: Diff 522373.May 15 2023, 3:48 PM
jdoerfert added inline comments.May 15 2023, 4:11 PM
openmp/libomptarget/test/jit/empty_kernel_target.c
5 ↗(On Diff #522373)

One of many:
llvm/test/Transforms/Util/strip-nonlinetable-debuginfo-loops.ll:; RUN: cat %t | FileCheck %s

tianshilei1992 added inline comments.May 15 2023, 4:16 PM
openmp/libomptarget/test/jit/empty_kernel_target.c
5 ↗(On Diff #522373)

Well, that's fair, but since FileCheck supports --input-file, I'd prefer to make it portable, though we only support Linux now.

jdoerfert added inline comments.May 15 2023, 4:37 PM
openmp/libomptarget/test/jit/empty_kernel_target.c
5 ↗(On Diff #522373)

will change.

jdoerfert updated this revision to Diff 522396.May 15 2023, 5:56 PM
jdoerfert edited the summary of this revision. (Show Details)

update according to comments, more tests (consolidated)

Harbormaster completed remote builds in B232163: Diff 522396.May 15 2023, 6:00 PM
tianshilei1992 accepted this revision.May 17 2023, 11:51 AM

LG

This revision is now accepted and ready to land.May 17 2023, 11:51 AM
Closed by commit rGbda72457a84a: [OpenMP] Add JIT and IR tests (authored by jdoerfert). · Explain WhyMay 18 2023, 1:28 PM
This revision was automatically updated to reflect the committed changes.
jdoerfert added a commit: rGbda72457a84a: [OpenMP] Add JIT and IR tests.
Herald added a project: Restricted Project. · View Herald TranscriptMay 18 2023, 1:28 PM
Herald added a subscriber: openmp-commits. · View Herald Transcript

Revision Contents

PathSize
openmp/
libomptarget/
test/
jit/
41 lines
34 lines
96 lines
2 lines

Diff 523536

openmp/libomptarget/test/jit/empty_kernel.inc

  • This file was added.
int main(int argc, char** argv) {
#pragma omp TGT1_DIRECTIVE
{
#ifdef LOOP_DIRECTIVE
#pragma omp LOOP_DIRECTIVE
for (int i = 0; i < argc; ++i)
#endif
{
#ifdef BODY_DIRECTIVE
#pragma omp BODY_DIRECTIVE
{
}
#endif
}
}
#ifdef TGT2_DIRECTIVE
#pragma omp TGT2_DIRECTIVE
{
#ifdef LOOP_DIRECTIVE
#pragma omp LOOP_DIRECTIVE
for (int i = 0; i < argc; ++i)
#endif
{
#ifdef BODY_DIRECTIVE
#pragma omp BODY_DIRECTIVE
{
}
#endif
}
}
#endif
}
// Check for an empty kernel (IR level)
// FIRST: define weak_odr {{.*}} void @__omp_offloading_{{.*}}_main
// FIRST-NEXT: ret void
// Check for two empty kernels (IR level)
// SECOND: define weak_odr {{.*}} void @__omp_offloading_{{.*}}_main
// SECOND-NEXT: ret void

openmp/libomptarget/test/jit/empty_kernel_lvl1.c

  • This file was added.
// clang-format off
// RUN: %libomptarget-compileopt-generic -fopenmp-target-jit \
// RUN: -DTGT1_DIRECTIVE="target"
// 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-compileopt-generic -fopenmp-target-jit \
// RUN: -DTGT1_DIRECTIVE="target" \
// RUN: -DTGT2_DIRECTIVE="target"
// 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-prefixes=FIRST
//
// RUN: %libomptarget-compileopt-generic -fopenmp-target-jit \
// RUN: -DTGT1_DIRECTIVE="target teams"
// 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-compileopt-generic -fopenmp-target-jit \
// RUN: -DTGT1_DIRECTIVE="target teams" \
// RUN: -DTGT2_DIRECTIVE="target teams"
// 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-prefixes=FIRST,SECOND
// clang-format on
// UNSUPPORTED: x86_64-pc-linux-gnu
// UNSUPPORTED: x86_64-pc-linux-gnu-LTO
#include "empty_kernel.inc"

openmp/libomptarget/test/jit/empty_kernel_lvl2.c

  • This file was added.
// clang-format off
// RUN: %libomptarget-compileoptxx-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
// 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" \
// 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
// 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" \
// 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
// UNSUPPORTED: x86_64-pc-linux-gnu
// UNSUPPORTED: x86_64-pc-linux-gnu-LTO
#include "empty_kernel.inc"

openmp/libomptarget/test/lit.cfg

Show First 20 Lines • Show All 175 Lines • ▼ Show 20 Lines if libomptarget_target == config.libomptarget_current_target:
config.substitutions.append(("%libomptarget-run-fail-generic", config.substitutions.append(("%libomptarget-run-fail-generic",
"%libomptarget-run-fail-" + libomptarget_target)) "%libomptarget-run-fail-" + libomptarget_target))
config.substitutions.append(("%clangxx-generic", config.substitutions.append(("%clangxx-generic",
"%clangxx-" + libomptarget_target)) "%clangxx-" + libomptarget_target))
config.substitutions.append(("%clang-generic", config.substitutions.append(("%clang-generic",
"%clang-" + libomptarget_target)) "%clang-" + libomptarget_target))
config.substitutions.append(("%fcheck-generic", config.substitutions.append(("%fcheck-generic",
config.libomptarget_filecheck + " %s")) config.libomptarget_filecheck + " %s"))
config.substitutions.append(("%fcheck-plain-generic",
config.libomptarget_filecheck))
config.substitutions.append(("%libomptarget-compilexx-run-and-check-" + \ config.substitutions.append(("%libomptarget-compilexx-run-and-check-" + \
libomptarget_target, \ libomptarget_target, \
"%libomptarget-compilexx-and-run-" + libomptarget_target + \ "%libomptarget-compilexx-and-run-" + libomptarget_target + \
" | " + config.libomptarget_filecheck + " %s")) " | " + config.libomptarget_filecheck + " %s"))
config.substitutions.append(("%libomptarget-compile-run-and-check-" + \ config.substitutions.append(("%libomptarget-compile-run-and-check-" + \
libomptarget_target, \ libomptarget_target, \
▲ Show 20 Lines • Show All 111 Lines • Show Last 20 Lines