From 094fae8e219bad2fabdc2681df64b23357128a12 Mon Sep 17 00:00:00 2001
From: thomas <thomas.koopman@ru.nl>
Date: Mon, 2 Dec 2024 12:28:22 +0100
Subject: [PATCH] Don't overload the enum
---
src/libsac2c/global/globals.mac | 2 +-
src/libsac2c/global/options.c | 6 +++---
src/libsac2c/global/phase_sac2c.mac | 8 +++++---
src/libsac2c/types/types.h | 6 +++---
4 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/src/libsac2c/global/globals.mac b/src/libsac2c/global/globals.mac
index 2801308e3..60801de2e 100644
--- a/src/libsac2c/global/globals.mac
+++ b/src/libsac2c/global/globals.mac
@@ -1403,7 +1403,7 @@ GLOBAL (bool, mutc_seq_data_parallel, FALSE, xfree_dummy, )
GLOBAL (cuda_async_mode_t, cuda_async_mode, CUDA_SYNC_DEVICE, xfree_dummy, )
GLOBAL (size_t, cuda_gpu_branching, 0, xfree_dummy, )
GLOBAL (enum gpu_mapping_strategy_t, gpu_mapping_strategy, Foldall, xfree_dummy, )
-GLOBAL (enum gpu_mem_advice_t, gpu_mem_advice, INFER, xfree_dummy, )
+GLOBAL (enum gpu_mem_advice_t, gpu_mem_advice, GPU_MEM_ADVICE_INFER, xfree_dummy, )
GLOBAL (bool, gpu_mapping_compress, TRUE, xfree_dummy, )
GLOBAL (bool, gpu_measure_kernel_time, FALSE, xfree_dummy, )
diff --git a/src/libsac2c/global/options.c b/src/libsac2c/global/options.c
index 1343f91aa..25eda07d4 100644
--- a/src/libsac2c/global/options.c
+++ b/src/libsac2c/global/options.c
@@ -812,9 +812,9 @@ AnalyseCommandlineSac2c (int argc, char *argv[])
ARGS_OPTION_BEGIN ("gpu_memory_advice")
{
ARG_CHOICE_BEGIN ();
- ARG_CHOICE ("a", global.gpu_mem_advice = ALWAYS);
- ARG_CHOICE ("n", global.gpu_mem_advice = NEVER);
- ARG_CHOICE ("i", global.gpu_mem_advice = INFER);
+ ARG_CHOICE ("a", global.gpu_mem_advice = GPU_MEM_ADVICE_ALWAYS);
+ ARG_CHOICE ("n", global.gpu_mem_advice = GPU_MEM_ADVICE_NEVER);
+ ARG_CHOICE ("i", global.gpu_mem_advice = GPU_MEM_ADVICE_INFER);
ARG_CHOICE_END ();
}
ARGS_OPTION_END ("gpu_memory_advice");
diff --git a/src/libsac2c/global/phase_sac2c.mac b/src/libsac2c/global/phase_sac2c.mac
index 7b0e3d049..e738a136e 100644
--- a/src/libsac2c/global/phase_sac2c.mac
+++ b/src/libsac2c/global/phase_sac2c.mac
@@ -496,8 +496,9 @@ CYCLEPHASE (lof, "Lifting optimization flags", LOFdoLiftOptFlags, ALWAYS, opt, c
ENDCYCLE (cyc)
SUBPHASE (icao, "Infer constant access offset", ICAOdoInferAccessOffset,
- (global.gpu_mem_advice == INFER) && global.optimize.documm
- && STReq (global.config.cuda_alloc, "cuman"),
+ (global.gpu_mem_advice == GPU_MEM_ADVICE_INFER) &&
+ global.optimize.documm &&
+ STReq (global.config.cuda_alloc, "cuman"),
opt)
CYCLE (saacyc, "Symbolic array attribute cycle 2", global.optimize.dosaacyc, opt, RESET)
@@ -1462,7 +1463,8 @@ SUBPHASE( mvsmi,
SUBPHASE (re, "Removing reuse instructions", EMREdoReuseElimination, ALWAYS, mem)
SUBPHASE (icma, "Insert CUDA memory advice when using CUDA managed memory", ICMAdoInsertMemoryAdvice,
- ((global.gpu_mem_advice == ALWAYS || global.gpu_mem_advice == INFER))
+ ((global.gpu_mem_advice == GPU_MEM_ADVICE_ALWAYS
+ || global.gpu_mem_advice == GPU_MEM_ADVICE_INFER))
&& (STReq (global.config.cuda_alloc, "cuman")
|| STReq (global.config.cuda_alloc, "cumanp")), mem)
diff --git a/src/libsac2c/types/types.h b/src/libsac2c/types/types.h
index 642151e8d..caf4b2058 100644
--- a/src/libsac2c/types/types.h
+++ b/src/libsac2c/types/types.h
@@ -1148,9 +1148,9 @@ enum gpu_mapping_strategy_t {
};
enum gpu_mem_advice_t {
- ALWAYS,
- NEVER,
- INFER
+ GPU_MEM_ADVICE_ALWAYS,
+ GPU_MEM_ADVICE_NEVER,
+ GPU_MEM_ADVICE_INFER
};
--
GitLab