[Openmp-commits] [openmp] 6c75ce1 - [libomptarget][nfc] Move lanemask_t type into target_impl.h

[Jon Chesterfield via Openmp-commits]

Author: Jon Chesterfield
Date: 2021-08-19T18:50:03+01:00
New Revision: 6c75ce1b8b99e70c370ebac897145edd5482699c

URL: https://github.com/llvm/llvm-project/commit/6c75ce1b8b99e70c370ebac897145edd5482699c
DIFF: https://github.com/llvm/llvm-project/commit/6c75ce1b8b99e70c370ebac897145edd5482699c.diff

LOG: [libomptarget][nfc] Move lanemask_t type into target_impl.h

Added: 
    

Modified: 
    openmp/libomptarget/deviceRTLs/amdgcn/src/amdgcn_interface.h
    openmp/libomptarget/deviceRTLs/amdgcn/src/target_impl.h
    openmp/libomptarget/deviceRTLs/nvptx/src/nvptx_interface.h
    openmp/libomptarget/deviceRTLs/nvptx/src/target_impl.h

Removed: 
    


################################################################################
diff  --git a/openmp/libomptarget/deviceRTLs/amdgcn/src/amdgcn_interface.h b/openmp/libomptarget/deviceRTLs/amdgcn/src/amdgcn_interface.h
index 1e653dad581e2..c3b2f59d636e2 100644
--- a/openmp/libomptarget/deviceRTLs/amdgcn/src/amdgcn_interface.h
+++ b/openmp/libomptarget/deviceRTLs/amdgcn/src/amdgcn_interface.h
@@ -12,7 +12,6 @@
 #include <stdint.h>
 
 #define EXTERN extern "C"
-typedef uint64_t __kmpc_impl_lanemask_t;
 typedef uint32_t omp_lock_t; /* arbitrary type of the right length */
 
 EXTERN uint32_t __kmpc_amdgcn_gpu_num_threads();

diff  --git a/openmp/libomptarget/deviceRTLs/amdgcn/src/target_impl.h b/openmp/libomptarget/deviceRTLs/amdgcn/src/target_impl.h
index fe1c6a7870239..830911d28a2af 100644
--- a/openmp/libomptarget/deviceRTLs/amdgcn/src/target_impl.h
+++ b/openmp/libomptarget/deviceRTLs/amdgcn/src/target_impl.h
@@ -25,6 +25,8 @@
 #define PRId64 "ld"
 #define PRIu64 "lu"
 
+typedef uint64_t __kmpc_impl_lanemask_t;
+
 #define INLINE inline
 #define NOINLINE __attribute__((noinline))
 #define ALIGN(N) __attribute__((aligned(N)))

diff  --git a/openmp/libomptarget/deviceRTLs/nvptx/src/nvptx_interface.h b/openmp/libomptarget/deviceRTLs/nvptx/src/nvptx_interface.h
index f3e34c2044b1e..b8fd91edcd8f7 100644
--- a/openmp/libomptarget/deviceRTLs/nvptx/src/nvptx_interface.h
+++ b/openmp/libomptarget/deviceRTLs/nvptx/src/nvptx_interface.h
@@ -12,8 +12,6 @@
 #include <stdint.h>
 
 #define EXTERN extern "C"
-
-typedef uint32_t __kmpc_impl_lanemask_t;
 typedef uint32_t omp_lock_t; /* arbitrary type of the right length */
 
 #endif

diff  --git a/openmp/libomptarget/deviceRTLs/nvptx/src/target_impl.h b/openmp/libomptarget/deviceRTLs/nvptx/src/target_impl.h
index a2346d4576a53..196f6236135c4 100644
--- a/openmp/libomptarget/deviceRTLs/nvptx/src/target_impl.h
+++ b/openmp/libomptarget/deviceRTLs/nvptx/src/target_impl.h
@@ -18,6 +18,8 @@
 
 #include "nvptx_interface.h"
 
+typedef uint32_t __kmpc_impl_lanemask_t;
+
 #define INLINE inline __attribute__((always_inline))
 #define NOINLINE __attribute__((noinline))
 #define ALIGN(N) __attribute__((aligned(N)))