Merge pull request icl-utk-edu#205 from Treece-Burgess/2024-07-16_cud…

…a-12.4-bug-fix Renaming cupti_common.* to papi_cupti_common.* to fix building in Cuda >=12.4
dbarry9 · Jul 24, 2024 · 80747c0 · 80747c0
2 parents 4b6a4f7 + 943e970
commit 80747c0
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/src/components/cuda/Rules.cuda b/src/components/cuda/Rules.cuda
@@ -8,11 +8,11 @@ CUDA_MACS+= -DPAPI_CUDA_CUPTI=$(PAPI_CUDA_CUPTI) -DPAPI_CUDA_PERFWORKS=$(PAPI_CU
 COMPSRCS += components/cuda/linux-cuda.c \
             components/cuda/cupti_dispatch.c \
             components/cuda/cupti_utils.c \
-            components/cuda/cupti_common.c \
+            components/cuda/papi_cupti_common.c \
             components/cuda/cupti_profiler.c \
             components/cuda/cupti_events.c \
 
-COMPOBJS += linux-cuda.o cupti_dispatch.o cupti_utils.o cupti_common.o cupti_profiler.o cupti_events.o
+COMPOBJS += linux-cuda.o cupti_dispatch.o cupti_utils.o papi_cupti_common.o cupti_profiler.o cupti_events.o
 
 # CFLAGS specifies compile flags; need include files here, and macro defines.
 CFLAGS += -I$(PAPI_CUDA_ROOT)/include -I$(PAPI_CUDA_ROOT)/extras/CUPTI/include -g $(CUDA_MACS)
@@ -27,8 +27,8 @@ cupti_dispatch.o: components/cuda/cupti_dispatch.c
 cupti_utils.o: components/cuda/cupti_utils.c $(HEADERS)
 	$(CC) $(LIBCFLAGS) $(OPTFLAGS) -c components/cuda/cupti_utils.c -o cupti_utils.o
 
-cupti_common.o: components/cuda/cupti_common.c
-	$(CC) $(LIBCFLAGS) $(OPTFLAGS) -c components/cuda/cupti_common.c -o cupti_common.o
+papi_cupti_common.o: components/cuda/papi_cupti_common.c
+	$(CC) $(LIBCFLAGS) $(OPTFLAGS) -c components/cuda/papi_cupti_common.c -o papi_cupti_common.o
 
 cupti_profiler.o: components/cuda/cupti_profiler.c
 	$(CC) $(LIBCFLAGS) $(OPTFLAGS) -c components/cuda/cupti_profiler.c -o cupti_profiler.o

diff --git a/src/components/cuda/cupti_dispatch.c b/src/components/cuda/cupti_dispatch.c
@@ -5,7 +5,7 @@
  */
 
 #include "cupti_config.h"
-#include "cupti_common.h"
+#include "papi_cupti_common.h"
 #include "cupti_dispatch.h"
 #include "lcuda_debug.h"
 

diff --git a/src/components/cuda/cupti_events.c b/src/components/cuda/cupti_events.c
@@ -6,7 +6,7 @@
 
 #include <papi.h>
 #include "cupti_events.h"
-#include "cupti_common.h"
+#include "papi_cupti_common.h"
 
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 /* Functions needed by CUPTI Events API */

diff --git a/src/components/cuda/cupti_profiler.c b/src/components/cuda/cupti_profiler.c
@@ -14,7 +14,7 @@
 #include <nvperf_cuda_host.h>
 #include <nvperf_target.h>
 
-#include "cupti_common.h"
+#include "papi_cupti_common.h"
 #include "cupti_profiler.h"
 #include "lcuda_debug.h"
 

diff --git a/src/components/cuda/cupti_common.c → src/components/cuda/papi_cupti_common.c b/src/components/cuda/cupti_common.c → src/components/cuda/papi_cupti_common.c
@@ -1,5 +1,5 @@
 /**
- * @file    cupti_common.c
+ * @file    papi_cupti_common.c
  * @author  Anustuv Pal
  *          [email protected]
  */
@@ -11,7 +11,7 @@
 #include "papi_memory.h"
 
 #include "cupti_config.h"
-#include "cupti_common.h"
+#include "papi_cupti_common.h"
 
 static void *dl_drv, *dl_rt;
 

diff --git a/src/components/cuda/cupti_common.h → src/components/cuda/papi_cupti_common.h b/src/components/cuda/cupti_common.h → src/components/cuda/papi_cupti_common.h
@@ -1,11 +1,11 @@
 /**
- * @file    cupti_common.h
+ * @file    papi_cupti_common.h
  * @author  Anustuv Pal
  *          [email protected]
  */
 
-#ifndef __CUPTI_COMMON_H__
-#define __CUPTI_COMMON_H__
+#ifndef __PAPI_CUPTI_COMMON_H__
+#define __PAPI_CUPTI_COMMON_H__
 
 #include <stdio.h>
 #include <cuda.h>
@@ -107,4 +107,4 @@ int cuptic_ctxarr_destroy(cuptic_info_t *pinfo);
 int cuptic_device_acquire(cuptiu_event_table_t *evt_table);
 int cuptic_device_release(cuptiu_event_table_t *evt_table);
 
-#endif /* __CUPTI_COMMON_H__ */
+#endif /* __PAPI_CUPTI_COMMON_H__ */