Add test that higher-granularity masks override lower-granularity ones

Stream-level masks should always override globally-set masks.
Next-kernel masks should always override both stream-level masks
and globally-set masks.

Tests reveal an issue with the next-kernel mask not overriding the
stream mask on CUDA 11.0+. CUDA appears to apply the per-stream
mask to the QMD/TMD after `launchCallback()` is triggered, making
it impossible to override as currently implemented.

1 files changed, 9 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index b91f6b9..dcf44e4 100644
--- a/Makefile
+++ b/Makefile
@@ -26,12 +26,19 @@ libsmctrl_test_global_mask: libsmctrl_test_global_mask.c libsmctrl.a libsmctrl_t
 libsmctrl_test_stream_mask: libsmctrl_test_stream_mask.c libsmctrl.a libsmctrl_test_mask_shared.o
         $(NVCC) $@.c -o $@ libsmctrl_test_mask_shared.o -g -L. -l:libsmctrl.a $(LDFLAGS)
 
+libsmctrl_test_stream_mask_override: libsmctrl_test_stream_mask_override.c libsmctrl.a libsmctrl_test_mask_shared.o
+        $(NVCC) $@.c -o $@ libsmctrl_test_mask_shared.o -g -L. -l:libsmctrl.a $(LDFLAGS)
+
 libsmctrl_test_next_mask: libsmctrl_test_next_mask.c libsmctrl.a libsmctrl_test_mask_shared.o
         $(NVCC) $@.c -o $@ libsmctrl_test_mask_shared.o -g -L. -l:libsmctrl.a $(LDFLAGS)
 
-tests: libsmctrl_test_gpc_info libsmctrl_test_global_mask libsmctrl_test_stream_mask libsmctrl_test_next_mask
+libsmctrl_test_next_mask_override: libsmctrl_test_next_mask_override.c libsmctrl.a libsmctrl_test_mask_shared.o
+        $(NVCC) $@.c -o $@ libsmctrl_test_mask_shared.o -g -L. -l:libsmctrl.a $(LDFLAGS)
+
+tests: libsmctrl_test_gpc_info libsmctrl_test_global_mask libsmctrl_test_stream_mask libsmctrl_test_stream_mask_override libsmctrl_test_next_mask libsmctrl_test_next_mask_override
 
 clean:
         rm -f libsmctrl.so libsmctrl.a libsmctrl_test_gpu_info \
               libsmctrl_test_mask_shared.o libmsctrl_test_global_mask \
-              libsmctrl_test_stream_mask libmsctrl_test_next_mask
+              libsmctrl_test_stream_mask libmsctrl_test_stream_mask_override \
+              libsmctrl_test_next_mask libmsctrl_test_next_mask_override