51168ce8d5
D113602 broke the custom state machine when a reduction is present, as revealed by the reproducer this patch adds to the test suite. In that case, openmp-opts changes the return value to undef in `__kmpc_get_warp_size` (which the custom state machine calls as of D113602). Later optimizations then optimize away the custom state machine code as if all threads are outside the thread block, so the target region does not execute. D114802 fixed that but didn't add a reproducer. This patch also adds a `__OMP_RTL_ATTRS` entry for `__kmpc_get_warp_size` to OMPKinds.def, which D113602 missed. This change does not seem to have any impact on the reduction problem. Reviewed By: JonChesterfield, jdoerfert Differential Revision: https://reviews.llvm.org/D113824
54 lines
1.9 KiB
C
54 lines
1.9 KiB
C
// Use the generic state machine. On some architectures, other threads in the
|
|
// main thread's warp must avoid barrier instructions.
|
|
//
|
|
// RUN: %libomptarget-compile-run-and-check-generic
|
|
|
|
// SPMDize. There is no main thread, so there's no issue.
|
|
//
|
|
// RUN: %libomptarget-compile-generic -O1 -Rpass=openmp-opt > %t.spmd 2>&1
|
|
// RUN: %fcheck-nvptx64-nvidia-cuda -check-prefix=SPMD -input-file=%t.spmd
|
|
// RUN: %fcheck-amdgcn-amd-amdhsa -check-prefix=SPMD -input-file=%t.spmd
|
|
// RUN: %libomptarget-run-generic 2>&1 | %fcheck-generic
|
|
//
|
|
// SPMD: Transformed generic-mode kernel to SPMD-mode.
|
|
|
|
// Use the custom state machine, which must avoid the same barrier problem as
|
|
// the generic state machine.
|
|
//
|
|
// RUN: %libomptarget-compile-generic -O1 -Rpass=openmp-opt \
|
|
// RUN: -mllvm -openmp-opt-disable-spmdization > %t.custom 2>&1
|
|
// RUN: %fcheck-nvptx64-nvidia-cuda -check-prefix=CUSTOM -input-file=%t.custom
|
|
// RUN: %fcheck-amdgcn-amd-amdhsa -check-prefix=CUSTOM -input-file=%t.custom
|
|
// RUN: %libomptarget-run-generic 2>&1 | %fcheck-generic
|
|
//
|
|
// Repeat with reduction clause, which has managed to break the custom state
|
|
// machine in the past.
|
|
//
|
|
// RUN: %libomptarget-compile-generic -O1 -Rpass=openmp-opt -DADD_REDUCTION \
|
|
// RUN: -mllvm -openmp-opt-disable-spmdization > %t.custom 2>&1
|
|
// RUN: %fcheck-nvptx64-nvidia-cuda -check-prefix=CUSTOM -input-file=%t.custom
|
|
// RUN: %fcheck-amdgcn-amd-amdhsa -check-prefix=CUSTOM -input-file=%t.custom
|
|
// RUN: %libomptarget-run-generic 2>&1 | %fcheck-generic
|
|
//
|
|
// CUSTOM: Rewriting generic-mode kernel with a customized state machine.
|
|
|
|
#if ADD_REDUCTION
|
|
# define REDUCTION(...) reduction(__VA_ARGS__)
|
|
#else
|
|
# define REDUCTION(...)
|
|
#endif
|
|
|
|
#include <stdio.h>
|
|
int main() {
|
|
int x = 0, y = 1;
|
|
#pragma omp target teams num_teams(1) map(tofrom:x, y) REDUCTION(+:x)
|
|
{
|
|
x += 5;
|
|
#pragma omp parallel
|
|
y = 6;
|
|
}
|
|
// CHECK: 5, 6
|
|
printf("%d, %d\n", x, y);
|
|
return 0;
|
|
}
|