From f9cb9c18a023ed2c88056dab85ceb3c50ea530c8 Mon Sep 17 00:00:00 2001 From: George Rokos Date: Sat, 22 Apr 2017 11:21:54 +0000 Subject: [PATCH] [OpenMP] libomptarget: Remove obsolete negative device IDs -2/-3 Differential Revision: https://reviews.llvm.org/D32325 llvm-svn: 301075 --- openmp/libomptarget/src/omptarget.cpp | 14 -------------- openmp/libomptarget/src/omptarget.h | 2 -- 2 files changed, 16 deletions(-) diff --git a/openmp/libomptarget/src/omptarget.cpp b/openmp/libomptarget/src/omptarget.cpp index 1c04e3f..eb1e765 100644 --- a/openmp/libomptarget/src/omptarget.cpp +++ b/openmp/libomptarget/src/omptarget.cpp @@ -2208,13 +2208,6 @@ static int target(int32_t device_id, void *host_ptr, int32_t arg_num, EXTERN int __tgt_target(int32_t device_id, void *host_ptr, int32_t arg_num, void **args_base, void **args, int64_t *arg_sizes, int32_t *arg_types) { - if (device_id == OFFLOAD_DEVICE_CONSTRUCTOR || - device_id == OFFLOAD_DEVICE_DESTRUCTOR) { - // Return immediately for the time being, target calls with device_id - // -2 or -3 will be removed from the compiler in the future. - return OFFLOAD_SUCCESS; - } - DP("Entering target region with entry point " DPxMOD " and device Id %d\n", DPxPTR(host_ptr), device_id); @@ -2262,13 +2255,6 @@ EXTERN int __tgt_target_nowait(int32_t device_id, void *host_ptr, EXTERN int __tgt_target_teams(int32_t device_id, void *host_ptr, int32_t arg_num, void **args_base, void **args, int64_t *arg_sizes, int32_t *arg_types, int32_t team_num, int32_t thread_limit) { - if (device_id == OFFLOAD_DEVICE_CONSTRUCTOR || - device_id == OFFLOAD_DEVICE_DESTRUCTOR) { - // Return immediately for the time being, target calls with device_id - // -2 or -3 will be removed from the compiler in the future. - return OFFLOAD_SUCCESS; - } - DP("Entering target region with entry point " DPxMOD " and device Id %d\n", DPxPTR(host_ptr), device_id); diff --git a/openmp/libomptarget/src/omptarget.h b/openmp/libomptarget/src/omptarget.h index ec2f99f..357bdcb 100644 --- a/openmp/libomptarget/src/omptarget.h +++ b/openmp/libomptarget/src/omptarget.h @@ -21,8 +21,6 @@ #define OFFLOAD_FAIL (~0) #define OFFLOAD_DEVICE_DEFAULT -1 -#define OFFLOAD_DEVICE_CONSTRUCTOR -2 -#define OFFLOAD_DEVICE_DESTRUCTOR -3 #define HOST_DEVICE -10 /// Data attributes for each data reference used in an OpenMP target region. -- 2.7.4