[Openmp-commits] [openmp] 65564e5 - Revert "[OpenMP] Implement TR8 `present` motion modifier in runtime (2/2)"
Joel E. Denny via Openmp-commits
openmp-commits at lists.llvm.org
Tue Jul 28 17:30:24 PDT 2020
Author: Joel E. Denny
Date: 2020-07-28T20:30:05-04:00
New Revision: 65564e5eaf143cb3c43907cc546d76e2b20e59f3
URL: https://github.com/llvm/llvm-project/commit/65564e5eaf143cb3c43907cc546d76e2b20e59f3
DIFF: https://github.com/llvm/llvm-project/commit/65564e5eaf143cb3c43907cc546d76e2b20e59f3.diff
LOG: Revert "[OpenMP] Implement TR8 `present` motion modifier in runtime (2/2)"
This reverts commit 2cb926a447d22166dac0d6e6dceaf5b3616ef6a1.
It depends on 3c3faae497046be706df29e16c9fbccb7e1fce09, which is being
reverted.
Added:
Modified:
openmp/libomptarget/src/omptarget.cpp
Removed:
openmp/libomptarget/test/mapping/present/target_update.c
################################################################################
diff --git a/openmp/libomptarget/src/omptarget.cpp b/openmp/libomptarget/src/omptarget.cpp
index d057c88bad10..f109c6acc8ca 100644
--- a/openmp/libomptarget/src/omptarget.cpp
+++ b/openmp/libomptarget/src/omptarget.cpp
@@ -628,12 +628,6 @@ int target_data_update(DeviceTy &Device, int32_t arg_num,
false, IsHostPtr);
if (!TgtPtrBegin) {
DP("hst data:" DPxMOD " not found, becomes a noop\n", DPxPTR(HstPtrBegin));
- if (arg_types[i] & OMP_TGT_MAPTYPE_PRESENT) {
- MESSAGE("device mapping required by 'present' motion modifier does not "
- "exist for host address " DPxMOD " (%ld bytes)",
- DPxPTR(HstPtrBegin), MapSize);
- return OFFLOAD_FAIL;
- }
continue;
}
diff --git a/openmp/libomptarget/test/mapping/present/target_update.c b/openmp/libomptarget/test/mapping/present/target_update.c
deleted file mode 100644
index 3a3575a27d01..000000000000
--- a/openmp/libomptarget/test/mapping/present/target_update.c
+++ /dev/null
@@ -1,73 +0,0 @@
-// --------------------------------------------------
-// Check 'to'
-// --------------------------------------------------
-
-// RUN: %libomptarget-compile-aarch64-unknown-linux-gnu \
-// RUN: -fopenmp-version=51 -DCLAUSE=to
-// RUN: %libomptarget-run-fail-aarch64-unknown-linux-gnu 2>&1 \
-// RUN: | %fcheck-aarch64-unknown-linux-gnu
-
-// RUN: %libomptarget-compile-powerpc64-ibm-linux-gnu \
-// RUN: -fopenmp-version=51 -DCLAUSE=to
-// RUN: %libomptarget-run-fail-powerpc64-ibm-linux-gnu 2>&1 \
-// RUN: | %fcheck-powerpc64-ibm-linux-gnu
-
-// RUN: %libomptarget-compile-powerpc64le-ibm-linux-gnu \
-// RUN: -fopenmp-version=51 -DCLAUSE=to
-// RUN: %libomptarget-run-fail-powerpc64le-ibm-linux-gnu 2>&1 \
-// RUN: | %fcheck-powerpc64le-ibm-linux-gnu
-
-// RUN: %libomptarget-compile-x86_64-pc-linux-gnu \
-// RUN: -fopenmp-version=51 -DCLAUSE=to
-// RUN: %libomptarget-run-fail-x86_64-pc-linux-gnu 2>&1 \
-// RUN: | %fcheck-x86_64-pc-linux-gnu
-
-// --------------------------------------------------
-// Check 'from'
-// --------------------------------------------------
-
-// RUN: %libomptarget-compile-aarch64-unknown-linux-gnu \
-// RUN: -fopenmp-version=51 -DCLAUSE=from
-// RUN: %libomptarget-run-fail-aarch64-unknown-linux-gnu 2>&1 \
-// RUN: | %fcheck-aarch64-unknown-linux-gnu
-
-// RUN: %libomptarget-compile-powerpc64-ibm-linux-gnu \
-// RUN: -fopenmp-version=51 -DCLAUSE=from
-// RUN: %libomptarget-run-fail-powerpc64-ibm-linux-gnu 2>&1 \
-// RUN: | %fcheck-powerpc64-ibm-linux-gnu
-
-// RUN: %libomptarget-compile-powerpc64le-ibm-linux-gnu \
-// RUN: -fopenmp-version=51 -DCLAUSE=from
-// RUN: %libomptarget-run-fail-powerpc64le-ibm-linux-gnu 2>&1 \
-// RUN: | %fcheck-powerpc64le-ibm-linux-gnu
-
-// RUN: %libomptarget-compile-x86_64-pc-linux-gnu \
-// RUN: -fopenmp-version=51 -DCLAUSE=from
-// RUN: %libomptarget-run-fail-x86_64-pc-linux-gnu 2>&1 \
-// RUN: | %fcheck-x86_64-pc-linux-gnu
-
-#include <stdio.h>
-
-int main() {
- int i;
-
- // CHECK: addr=0x[[#%x,HOST_ADDR:]], size=[[#%u,SIZE:]]
- fprintf(stderr, "addr=%p, size=%ld\n", &i, sizeof i);
-
- // CHECK-NOT: Libomptarget
-#pragma omp target enter data map(alloc: i)
-#pragma omp target update CLAUSE(present: i)
-#pragma omp target exit data map(delete: i)
-
- // CHECK: i is present
- fprintf(stderr, "i is present\n");
-
- // CHECK: Libomptarget message: device mapping required by 'present' motion modifier does not exist for host address 0x{{0*}}[[#HOST_ADDR]] ([[#SIZE]] bytes)
- // CHECK: Libomptarget fatal error 1: failure of target construct while offloading is mandatory
-#pragma omp target update CLAUSE(present: i)
-
- // CHECK-NOT: i is present
- fprintf(stderr, "i is present\n");
-
- return 0;
-}
More information about the Openmp-commits
mailing list