Skip to content
This repository has been archived by the owner on Mar 21, 2024. It is now read-only.

Add tests for host only TUs and fix several found issues. #340

Merged
merged 18 commits into from
Dec 13, 2022
Merged

Add tests for host only TUs and fix several found issues. #340

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
95b5736
Add tests to ensure headers can be compiled when alone and on host only
wmaxey Dec 8, 2022
c685e52
Remove extra new line from CMakeLists.txt
wmaxey Dec 8, 2022
8e5c4ca
Include required definitions in <cuda/std/array>
wmaxey Dec 8, 2022
4cb58a0
Compile standalone tests in the Linux containers
wmaxey Dec 8, 2022
28f9aee
Only install using the LLVM script when the host OS supports it.
wmaxey Dec 8, 2022
f99f7df
Compile host only using C++11 as a baseline. TODO: More targets
wmaxey Dec 8, 2022
f452bcb
Fix host only compilation of barrier, `<new>` required
wmaxey Dec 8, 2022
99bcfe3
More host only fixes for `<cmath>`
wmaxey Dec 8, 2022
03c0c11
Remove comments from mostly copied CMakeLists
wmaxey Dec 8, 2022
915ff1e
Build host tests with warnings and warnings as errors
wmaxey Dec 9, 2022
c75b8d2
Drop GCC-5 from tests
wmaxey Dec 9, 2022
79d1af6
Fix host only compilation for atomic on MSVC
wmaxey Dec 9, 2022
493cd40
Fix warning in <bit>
wmaxey Dec 9, 2022
673f048
Drop hacks required for GCC-5
wmaxey Dec 9, 2022
a9f0f54
Move abs outside of NVRTC check in <cmath>
wmaxey Dec 9, 2022
b725515
Drop `<cmath>` from includes
wmaxey Dec 9, 2022
8a44065
Bump NVRTC maximum cpp version to 20
wmaxey Dec 13, 2022
f60abbb
Move several cmath functions back outside of the NVRTC block
wmaxey Dec 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .upstream-tests/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,6 @@ configure_lit_site_cfg(
add_lit_testsuite(check-cudacxx
"Running libcu++ tests"
${CMAKE_CURRENT_BINARY_DIR})

# Add test target for standalone headers
add_subdirectory(host_only)
30 changes: 30 additions & 0 deletions .upstream-tests/test/host_only/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
function(libcudacxx_add_standalone_header_test test_file_output_var header_under_test)
wmaxey marked this conversation as resolved.
Show resolved Hide resolved
# ex: build/.../header_tests/cuda/std/version.cpp
set(test_cpp "${CMAKE_CURRENT_BINARY_DIR}/header_tests/${header_under_test}.cpp")

configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}/header_test.cpp.in"
"${test_cpp}"
)

set(${test_file_output_var} ${test_cpp} PARENT_SCOPE)
# ex: cuda/std/version -> cuda_std_version
string(REPLACE "/" "_" executable_name ${header_under_test})
add_executable(${executable_name} ${test_cpp})
target_include_directories(${executable_name} PRIVATE ${CMAKE_SOURCE_DIR}/include)
target_compile_options(${executable_name} PRIVATE
$<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>,$<CXX_COMPILER_ID:GNU>>:
-Wall -Werror>
$<$<CXX_COMPILER_ID:MSVC>:
/W4 /WX>)
set_target_properties(${executable_name} PROPERTIES CXX_STANDARD 11)
endfunction()

# Don't generate CUDA targets, they fail currently.
# file(GLOB cuda_headers LIST_DIRECTORIES false RELATIVE ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/include/cuda/*)
file(GLOB cuda_std_headers LIST_DIRECTORIES false RELATIVE ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/include/cuda/std/*)

foreach(header IN LISTS cuda_headers cuda_std_headers)
libcudacxx_add_standalone_header_test(test_file ${header})
message(STATUS "Detected ${header} ... Writing ${test_file}")
endforeach()
13 changes: 13 additions & 0 deletions .upstream-tests/test/host_only/header_test.cpp.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
//===----------------------------------------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//

#include <@header_under_test@>

int main() {
return 0;
}
1 change: 0 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,4 +230,3 @@ if (_libcudacxx_enable_tests)
ARGS ${LLVM_LIT_EXTRA_ARGS}
)
endif ()

19 changes: 4 additions & 15 deletions environments/linux/docker/compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ services:
target: devenv
args: &ubuntu22-args
BUILDKIT_INLINE_CACHE: "1"
USE_LLVM_INSTALLER: "1"
ROOT_IMAGE: "nvcr.io/nvidia/cuda:11.8.0-devel-ubuntu22.04"
COMPILERS: "g++-11 g++-12 clang-11 clang-12 clang-13 clang-14 clang-15"
deploy: &deploy-template
Expand All @@ -36,6 +37,7 @@ services:
target: devenv
args: &ubuntu20-args
BUILDKIT_INLINE_CACHE: "1"
USE_LLVM_INSTALLER: 0
ROOT_IMAGE: "nvcr.io/nvidia/cuda:11.8.0-devel-ubuntu20.04"
COMPILERS: "g++-8 g++-9 g++-10 clang-8 clang-9 clang-10"
deploy: *deploy-template
Expand All @@ -53,8 +55,9 @@ services:
target: devenv
args: &ubuntu18-args
BUILDKIT_INLINE_CACHE: "1"
USE_LLVM_INSTALLER: 0
ROOT_IMAGE: "nvcr.io/nvidia/cuda:11.8.0-devel-ubuntu18.04"
COMPILERS: "g++-5 g++-6 g++-7 clang-7"
COMPILERS: "g++-6 g++-7 clang-7"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AFAIK we settled on gcc-7 as the minimal supported version.

Do we want to drop gcc-6 while we are at it?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will consider it dropping later in another patch. In tandem with #341 would be good timing.

deploy: *deploy-template

##### Not used yet
Expand Down Expand Up @@ -246,20 +249,6 @@ services:


### Ubuntu 18.04 images:

gcc-5:
extends:
service: ubuntu18.04
image: "libcudacxx/gcc-5"
container_name: gcc-5
profiles: ["gcc-5"]
build:
context: ../../../
dockerfile: environments/linux/docker/ubuntu.base.Dockerfile
target: libcudacxx-configured
args:
HOST_CXX: "g++-5"

gcc-6:
extends:
service: ubuntu18.04
Expand Down
5 changes: 4 additions & 1 deletion environments/linux/docker/ubuntu.base.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ ARG UBUNTU_TOOL_DEB_REPO=https://ppa.launchpadcontent.net/ubuntu-toolchain-r/ppa
ARG UBUNTU_TOOL_FINGER=60C317803A41BA51845E371A1E9377A2BA9EF27F

ARG LLVM_INSTALLER=https://apt.llvm.org/llvm.sh
ARG USE_LLVM_INSTALLER=1

# `-y` answers yes to any interactive prompts.
# `-qq` because apt is noisy
ARG APT_GET="apt-get -y -qq"
Expand Down Expand Up @@ -44,7 +46,7 @@ RUN function comment() { :; }; \
python3 python3-wheel python3-pip; \
comment "Install GCC and Clang"; \
# Unattended installation hack
echo "\n" | bash /tmp/llvm.sh all; \
if [ "${USE_LLVM_INSTALLER}" -eq "1" ]; then echo "\n" | bash /tmp/llvm.sh all; fi; \
${APT_GET} install gcc g++ ${COMPILERS}; \
comment "Install CMake"; \
sh /tmp/cmake.sh --skip-license --prefix=/usr; \
Expand Down Expand Up @@ -87,6 +89,7 @@ RUN cmake -S /libcudacxx -B /build \
-DCMAKE_CUDA_FLAGS="-allow-unsupported-compiler"

RUN make -j -C /build/libcxx
RUN make -j -C /build/test/host_only

ENV LIBCUDACXX_SITE_CONFIG=/build/test/lit.site.cfg
ENV LIBCXX_SITE_CONFIG=/build/libcxx/test/lit.site.cfg
6 changes: 4 additions & 2 deletions include/cuda/std/array
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
#ifndef _CUDA_ARRAY
#define _CUDA_ARRAY

#ifndef __CUDACC_RTC__
# include <cstdlib>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Out of curiosity, what happens when using NVRTC with things like this? Will the functionality that depends on stuff from <cstdlib> just not work?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Usually NVRTC defines its own equivalent. It's all just __device__ only.

#endif

#include "cassert"
#include "cstdint"
#include "limits"
Expand All @@ -30,5 +34,3 @@
#include "detail/__pragma_pop"

#endif //_CUDA_ARRAY


4 changes: 4 additions & 0 deletions include/cuda/std/barrier
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
# error "CUDA synchronization primitives are only supported for sm_70 and up."
#endif

#ifndef __CUDACC_RTC__
# include <new>
#endif

#ifndef _CUDA_BARRIER
#define _CUDA_BARRIER

Expand Down
9 changes: 4 additions & 5 deletions include/cuda/std/cmath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,18 @@
#ifndef _CUDA_CMATH
#define _CUDA_CMATH

#ifndef __CUDACC_RTC__
#include <math.h>
#endif

#include "limits"
#include "type_traits"

#include "detail/__config"

#include "detail/__pragma_push"

#ifndef _LIBCUDACXX_COMPILER_NVRTC
#include <math.h>
#endif
#include "detail/libcxx/include/cmath"

#include "detail/__pragma_pop"

#endif //_CUDA_CMATH

4 changes: 2 additions & 2 deletions include/cuda/std/detail/libcxx/include/__config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -796,8 +796,8 @@ typedef __char32_t char32_t;
#define _LIBCUDACXX_HAS_NO_ASAN
#endif

#if _GNUC_VER < 600 && defined(_LIBCUDACXX_COMPILER_NVCC)
#define _LIBCUDACXX_MISSING_GCC_MATH_INTRINSICS
#if _GNUC_VER < 600
#define _LIBCUDACXX_GCC_MATH_IN_STD
#endif

#if _GNUC_VER >= 700
Expand Down
22 changes: 22 additions & 0 deletions include/cuda/std/detail/libcxx/include/atomic
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,6 +599,28 @@ void atomic_signal_fence(memory_order m) noexcept;
# include <string.h>
#endif

#if !defined(__CLANG_ATOMIC_BOOL_LOCK_FREE) && !defined(__GCC_ATOMIC_BOOL_LOCK_FREE)
#define ATOMIC_BOOL_LOCK_FREE 2
#define ATOMIC_CHAR_LOCK_FREE 2
#define ATOMIC_CHAR16_T_LOCK_FREE 2
#define ATOMIC_CHAR32_T_LOCK_FREE 2
#define ATOMIC_WCHAR_T_LOCK_FREE 2
#define ATOMIC_SHORT_LOCK_FREE 2
#define ATOMIC_INT_LOCK_FREE 2
#define ATOMIC_LONG_LOCK_FREE 2
#define ATOMIC_LLONG_LOCK_FREE 2
#define ATOMIC_POINTER_LOCK_FREE 2
#endif //!defined(__CLANG_ATOMIC_BOOL_LOCK_FREE) && !defined(__GCC_ATOMIC_BOOL_LOCK_FREE)

#ifndef __ATOMIC_RELAXED
#define __ATOMIC_RELAXED 0
#define __ATOMIC_CONSUME 1
#define __ATOMIC_ACQUIRE 2
#define __ATOMIC_RELEASE 3
#define __ATOMIC_ACQ_REL 4
#define __ATOMIC_SEQ_CST 5
#endif //__ATOMIC_RELAXED

_LIBCUDACXX_BEGIN_NAMESPACE_STD

// Figure out what the underlying type for `memory_order` would be if it were
Expand Down
2 changes: 1 addition & 1 deletion include/cuda/std/detail/libcxx/include/bit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ int __fallback_popc8(uint64_t __x) {
inline _LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_BIT_CONSTEXPR
int __fallback_popc16(uint64_t __x) {
return __fallback_popc8(
__x + (__x >> 4) & 0x0f0f0f0f0f0f0f0f);
(__x + (__x >> 4)) & 0x0f0f0f0f0f0f0f0f);
}

inline _LIBCUDACXX_INLINE_VISIBILITY _LIBCUDACXX_BIT_CONSTEXPR
Expand Down
18 changes: 8 additions & 10 deletions include/cuda/std/detail/libcxx/include/cmath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,12 +318,8 @@ long double truncl(long double x);
#define NAN __builtin_nan()
#endif

_LIBCUDACXX_BEGIN_NAMESPACE_STD

using ::signbit;
using ::isfinite;
using ::isinf;
using ::isnan;
_LIBCUDACXX_BEGIN_NAMESPACE_STD

using ::acos;
using ::acosf;
Expand Down Expand Up @@ -377,18 +373,20 @@ using ::abs;
#endif

#ifndef _LIBCUDACXX_COMPILER_NVRTC
// GCC <= 50X is missing some math intrinsics in the global namespace
#if !defined(_LIBCUDACXX_MISSING_GCC_MATH_INTRINSICS)

using ::fpclassify;
using ::isnormal;
using ::isgreater;
using ::isgreaterequal;
using ::isless;
using ::islessequal;
using ::islessgreater;

using ::signbit;
using ::isnan;
using ::isfinite;
using ::isinf;
using ::isnormal;
using ::isunordered;
using ::isunordered;
#endif

using ::float_t;
using ::double_t;
Expand Down
22 changes: 0 additions & 22 deletions include/cuda/std/detail/libcxx/include/support/atomic/atomic_cuda.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,28 +11,6 @@
# error "CUDA atomics are only supported for sm_60 and up on *nix and sm_70 and up on Windows."
#endif

#if !defined(__CLANG_ATOMIC_BOOL_LOCK_FREE) && !defined(__GCC_ATOMIC_BOOL_LOCK_FREE)
#define ATOMIC_BOOL_LOCK_FREE 2
#define ATOMIC_CHAR_LOCK_FREE 2
#define ATOMIC_CHAR16_T_LOCK_FREE 2
#define ATOMIC_CHAR32_T_LOCK_FREE 2
#define ATOMIC_WCHAR_T_LOCK_FREE 2
#define ATOMIC_SHORT_LOCK_FREE 2
#define ATOMIC_INT_LOCK_FREE 2
#define ATOMIC_LONG_LOCK_FREE 2
#define ATOMIC_LLONG_LOCK_FREE 2
#define ATOMIC_POINTER_LOCK_FREE 2
#endif //!defined(__CLANG_ATOMIC_BOOL_LOCK_FREE) && !defined(__GCC_ATOMIC_BOOL_LOCK_FREE)

#ifndef __ATOMIC_RELAXED
#define __ATOMIC_RELAXED 0
#define __ATOMIC_CONSUME 1
#define __ATOMIC_ACQUIRE 2
#define __ATOMIC_RELEASE 3
#define __ATOMIC_ACQ_REL 4
#define __ATOMIC_SEQ_CST 5
#endif //__ATOMIC_RELAXED

inline __host__ __device__ int __stronger_order_cuda(int __a, int __b) {
int const __max = __a > __b ? __a : __b;
if(__max != __ATOMIC_RELEASE)
Expand Down