diff options
author | Olexa Bilaniuk <obilaniu@gmail.com> | 2021-02-21 07:04:55 -0500 |
---|---|---|
committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2021-04-04 00:00:55 +0530 |
commit | 84bf8e1f736aba71a6009eae6f13b8981ddf8772 (patch) | |
tree | d6d58e186e066a4f6ce12fbe18d10ef163dbcf88 | |
parent | 7182685b2241e88340b6c3340afba59a26be213f (diff) | |
download | meson-84bf8e1f736aba71a6009eae6f13b8981ddf8772.zip meson-84bf8e1f736aba71a6009eae6f13b8981ddf8772.tar.gz meson-84bf8e1f736aba71a6009eae6f13b8981ddf8772.tar.bz2 |
Bugfix: Forward sanitizer_*_args() methods to host compiler.
Enables -Db_sanitize=undefined and company.
Also serves as a testcase for NVCC comma-shielding: Because the test-
case declares `b_sanitize=address,undefined`, the host GCC compiler
needs `-fsanitize=address,undefined`, but this stands a danger of being
split by NVCC when wrapped with `-Xcompiler=args,args`. Special,
already-existing comma-shielding codepaths activate to prevent this
splitting.
Closes #8394.
-rw-r--r-- | mesonbuild/compilers/cuda.py | 6 | ||||
-rw-r--r-- | test cases/cuda/15 sanitizer/meson.build | 4 | ||||
-rw-r--r-- | test cases/cuda/15 sanitizer/prog.cu | 30 |
3 files changed, 40 insertions, 0 deletions
diff --git a/mesonbuild/compilers/cuda.py b/mesonbuild/compilers/cuda.py index 4efe0c6..bbe6e95 100644 --- a/mesonbuild/compilers/cuda.py +++ b/mesonbuild/compilers/cuda.py @@ -625,6 +625,12 @@ class CudaCompiler(Compiler): # return self._to_host_flags(self.host_compiler.get_optimization_args(optimization_level)) return cuda_optimization_args[optimization_level] + def sanitizer_compile_args(self, value: str) -> T.List[str]: + return self._to_host_flags(self.host_compiler.sanitizer_compile_args(value)) + + def sanitizer_link_args(self, value: str) -> T.List[str]: + return self._to_host_flags(self.host_compiler.sanitizer_link_args(value)) + def get_debug_args(self, is_debug: bool) -> T.List[str]: return cuda_debug_args[is_debug] diff --git a/test cases/cuda/15 sanitizer/meson.build b/test cases/cuda/15 sanitizer/meson.build new file mode 100644 index 0000000..367a4e2 --- /dev/null +++ b/test cases/cuda/15 sanitizer/meson.build @@ -0,0 +1,4 @@ +project('simple', 'cuda', version : '1.0.0', + default_options: ['b_sanitize=address,undefined']) + +libtests = shared_library('tests', 'prog.cu') diff --git a/test cases/cuda/15 sanitizer/prog.cu b/test cases/cuda/15 sanitizer/prog.cu new file mode 100644 index 0000000..340b07a --- /dev/null +++ b/test cases/cuda/15 sanitizer/prog.cu @@ -0,0 +1,30 @@ +#include <iostream> + +int run_tests(void) { + int cuda_devices = 0; + std::cout << "CUDA version: " << CUDART_VERSION << "\n"; + cudaGetDeviceCount(&cuda_devices); + if(cuda_devices == 0) { + std::cout << "No Cuda hardware found. Exiting.\n"; + return 0; + } + std::cout << "This computer has " << cuda_devices << " Cuda device(s).\n"; + cudaDeviceProp props; + cudaGetDeviceProperties(&props, 0); + std::cout << "Properties of device 0.\n\n"; + + std::cout << " Name: " << props.name << "\n"; + std::cout << " Global memory: " << props.totalGlobalMem << "\n"; + std::cout << " Shared memory: " << props.sharedMemPerBlock << "\n"; + std::cout << " Constant memory: " << props.totalConstMem << "\n"; + std::cout << " Block registers: " << props.regsPerBlock << "\n"; + + std::cout << " Warp size: " << props.warpSize << "\n"; + std::cout << " Threads per block: " << props.maxThreadsPerBlock << "\n"; + std::cout << " Max block dimensions: [ " << props.maxThreadsDim[0] << ", " << props.maxThreadsDim[1] << ", " << props.maxThreadsDim[2] << " ]" << "\n"; + std::cout << " Max grid dimensions: [ " << props.maxGridSize[0] << ", " << props.maxGridSize[1] << ", " << props.maxGridSize[2] << " ]" << "\n"; + std::cout << "\n"; + + return 0; +} + |