This is an archive of the discontinued LLVM Phabricator instance.

Differential D106070

[HIP] Remove workaround in __clang_hip_runtime_wrapper.h
ClosedPublic

Authored by yaxunl on Jul 15 2021, 8:18 AM.

Details

Reviewers
tra
JonChesterfield
ronl
ashi1
jdoerfert
Commits
rGdb5f100fe4ca: [HIP] Remove workaround in __clang_hip_runtime_wrapper.h
Summary

Remove the workaround for -fopenmp in __clang_hip_runtime_wrapper.h
since it causes device functions in HIP wrapper headers disabled when
compiling HIP program with -fopenmp.

Diff Detail

Event Timeline

yaxunl requested review of this revision.Jul 15 2021, 8:18 AM
yaxunl created this revision.
Herald added a reviewer: jdoerfert. · View Herald TranscriptJul 15 2021, 8:18 AM
Herald added a subscriber: sstefan1. · View Herald Transcript
yaxunl added a comment.Jul 15 2021, 8:21 AM

Since this is not easily tested with lit tests, I added a test to llvm-test-suite: https://reviews.llvm.org/D106069

My understanding is that OpenMP no longer uses __clang_hip_runtime_wrapper.h, so we should be able to remove this workaround.

Harbormaster completed remote builds in B114245: Diff 358971.Jul 15 2021, 9:14 AM
JonChesterfield added a comment.Jul 15 2021, 9:27 AM

OK from the openmp gpu side as far as I can tell. This is probably another instance of where we really wanted _OPENMP_TARGET or similar.

ashi1 accepted this revision.Jul 15 2021, 9:33 AM

LGTM!

This revision is now accepted and ready to land.Jul 15 2021, 9:33 AM
This revision was landed with ongoing or failed builds.Jul 21 2021, 12:16 PM
Closed by commit rGdb5f100fe4ca: [HIP] Remove workaround in __clang_hip_runtime_wrapper.h (authored by yaxunl). · Explain Why
This revision was automatically updated to reflect the committed changes.
yaxunl added a commit: rGdb5f100fe4ca: [HIP] Remove workaround in __clang_hip_runtime_wrapper.h.
Herald added a project: Restricted Project. · View Herald TranscriptJul 21 2021, 12:16 PM

Revision Contents

PathSize
clang/
lib/
Headers/
2 lines

Diff 360550

clang/lib/Headers/__clang_hip_runtime_wrapper.h

Show First 20 Lines • Show All 95 Lines • ▼ Show 20 Lines
#define uint64_t __UINT64_TYPE__ #define uint64_t __UINT64_TYPE__
#define CHAR_BIT __CHAR_BIT__ #define CHAR_BIT __CHAR_BIT__
#define INT_MAX __INTMAX_MAX__ #define INT_MAX __INTMAX_MAX__
#endif // __HIPCC_RTC__ #endif // __HIPCC_RTC__
#include <__clang_hip_libdevice_declares.h> #include <__clang_hip_libdevice_declares.h>
#include <__clang_hip_math.h> #include <__clang_hip_math.h>
#if !_OPENMP || __HIP_ENABLE_CUDA_WRAPPER_FOR_OPENMP__
#if defined(__HIPCC_RTC__) #if defined(__HIPCC_RTC__)
#include <__clang_hip_cmath.h> #include <__clang_hip_cmath.h>
#else #else
#include <__clang_cuda_math_forward_declares.h> #include <__clang_cuda_math_forward_declares.h>
#include <__clang_hip_cmath.h> #include <__clang_hip_cmath.h>
#include <__clang_cuda_complex_builtins.h> #include <__clang_cuda_complex_builtins.h>
#include <algorithm> #include <algorithm>
#include <complex> #include <complex>
#include <new> #include <new>
#endif // __HIPCC_RTC__ #endif // __HIPCC_RTC__
#endif // !_OPENMP || __HIP_ENABLE_CUDA_WRAPPER_FOR_OPENMP__
#define __CLANG_HIP_RUNTIME_WRAPPER_INCLUDED__ 1 #define __CLANG_HIP_RUNTIME_WRAPPER_INCLUDED__ 1
#if defined(__HIPCC_RTC__) #if defined(__HIPCC_RTC__)
#pragma pop_macro("NULL") #pragma pop_macro("NULL")
#pragma pop_macro("uint32_t") #pragma pop_macro("uint32_t")
#pragma pop_macro("uint64_t") #pragma pop_macro("uint64_t")
#pragma pop_macro("CHAR_BIT") #pragma pop_macro("CHAR_BIT")
#pragma pop_macro("INT_MAX") #pragma pop_macro("INT_MAX")
#endif // __HIPCC_RTC__ #endif // __HIPCC_RTC__
#endif // __HIP__ #endif // __HIP__
#endif // __CLANG_HIP_RUNTIME_WRAPPER_H__ #endif // __CLANG_HIP_RUNTIME_WRAPPER_H__