Skip to content

Commit b2ac4ec

Browse files
committed
Makefiles:
- Build CUDA-specific tests with `-rdc=true`; they test device-side launch, which needs `-rdc=true` (today, the tests fallback to invoking the serial algorithms on the device, which makes them slow). - Remove old logic disabling codegen for random architectures. - Re-enable rounding in `bench.cu`. Bug 2808654 Reviewed-by: Michał 'Griwes' Dominiak <[email protected]>
1 parent 5ee2f88 commit b2ac4ec

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+59
-30
lines changed

dependencies/cub

Submodule cub updated from 04d36e6 to 11755ca

internal/benchmark/bench.cu

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,6 @@ struct experiment_driver
393393
);
394394
#endif
395395

396-
/*
397396
stl_average_walltime = round_to_precision(
398397
stl_average_walltime, stl_walltime_precision
399398
);
@@ -417,7 +416,6 @@ struct experiment_driver
417416
tbb_walltime_uncertainty, tbb_walltime_precision
418417
);
419418
#endif
420-
*/
421419

422420
// Round the average throughput and throughput uncertainty to the
423421
// significant figure of the throughput uncertainty.
@@ -436,7 +434,6 @@ struct experiment_driver
436434
);
437435
#endif
438436

439-
/*
440437
stl_average_throughput = round_to_precision(
441438
stl_average_throughput, stl_throughput_precision
442439
);
@@ -460,7 +457,6 @@ struct experiment_driver
460457
tbb_throughput_uncertainty, tbb_throughput_precision
461458
);
462459
#endif
463-
*/
464460

465461
std::cout << THRUST_VERSION // Thrust Version.
466462
<< "," << test_name // Algorithm.

internal/build/common_build.mk

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -11,31 +11,6 @@ ifeq ($(OS),win32)
1111
CUDACC_FLAGS += -Xcompiler "/bigobj"
1212
endif
1313

14-
ARCH_NEG_FILTER += 20 21
15-
# Determine which SASS to generate
16-
# if DVS (either per-CL or on-demand)
17-
ifneq ($(or $(THRUST_DVS),$(THRUST_DVS_NIGHTLY)),)
18-
# DVS doesn't run Thrust on fermi so filter out SM 2.0/2.1
19-
# DVS doesn't run Thrust on mobile so filter those out as well
20-
# DVS doesn't have PASCAL configs at the moment
21-
ARCH_NEG_FILTER += 20 21 32 37 53 60
22-
else
23-
# If building for ARMv7 (32-bit ARM), build only mobile SASS since no dGPU+ARM32 are supported anymore
24-
ifeq ($(TARGET_ARCH),ARMv7)
25-
ARCH_FILTER = 32 53 62
26-
endif
27-
# If its androideabi, we know its mobile, so can target specific SASS
28-
ifeq ($(OS),Linux)
29-
ifeq ($(ABITYPE), androideabi)
30-
ARCH_FILTER = 32 53 62
31-
ifeq ($(THRUST_TEST),1)
32-
NVCC_OPTIONS += -include "$(ROOTDIR)/cuda/tools/demangler/demangler.h"
33-
LIBRARIES += demangler
34-
endif
35-
endif
36-
endif
37-
endif
38-
3914
# Add -mthumb for Linux on ARM to work around bug in arm cross compiler from p4
4015
ifeq ($(TARGET_ARCH),ARMv7)
4116
ifneq ($(HOST_ARCH),ARMv7)

testing/cuda/adjacent_difference.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
CUDACC_FLAGS += -rdc=true

testing/cuda/complex.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
CUDACC_FLAGS += -rdc=true

testing/cuda/copy.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
CUDACC_FLAGS += -rdc=true

testing/cuda/copy_if.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
CUDACC_FLAGS += -rdc=true

testing/cuda/count.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
CUDACC_FLAGS += -rdc=true

testing/cuda/cudart.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
CUDACC_FLAGS += -rdc=true

testing/cuda/equal.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
CUDACC_FLAGS += -rdc=true

0 commit comments

Comments
 (0)