Unify TAU config files and remove old Fortran specific ones

ParaToolsInc · Dec 15, 2024 · 601e2e9 · 601e2e9
1 parent c754fd1
commit 601e2e9
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 28 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -629,7 +629,7 @@ foreach(test_source IN LISTS FORTRAN_TESTS_SOURCES_LIST)
   set_tests_properties(instrument_${test_source}
     PROPERTIES
     REQUIRED_FILES "${CMAKE_BINARY_DIR}/fparse-llvm"
-    ENVIRONMENT "SALT_FORTRAN_CONFIG_FILE=${CMAKE_SOURCE_DIR}/config_files/tau_fortran_config.yaml"
+    ENVIRONMENT "SALT_FORTRAN_CONFIG_FILE=${CMAKE_SOURCE_DIR}/config_files/tau_config.yaml"
     PASS_REGULAR_EXPRESSION "SALT Instrumentor Plugin finished"
   )
 endforeach()

diff --git a/config_files/fortran_config.yaml b/config_files/fortran_config.yaml
diff --git a/config_files/tau_fortran_config.yaml b/config_files/tau_fortran_config.yaml
diff --git a/src/fparse-llvm.in b/src/fparse-llvm.in
@@ -22,8 +22,8 @@ set -o pipefail
 #set -o xtrace
 
 readonly _VERSION=@SALT_VERSION_MAJOR@.@SALT_VERSION_MINOR@
-readonly _FORTRAN_CONFIG_FILE_BUILD=@CMAKE_SOURCE_DIR@/config_files/tau_fortran_config.yaml
-readonly _FORTRAN_CONFIG_FILE_INSTALL=@SALT_CONFIGFILES_INSTALL_DIR@/tau_fortran_config.yaml
+readonly _FORTRAN_CONFIG_FILE_BUILD=@CMAKE_SOURCE_DIR@/config_files/tau_config.yaml
+readonly _FORTRAN_CONFIG_FILE_INSTALL=@SALT_CONFIGFILES_INSTALL_DIR@/tau_config.yaml
 readonly _INSTALL_DEST=@CMAKE_INSTALL_PREFIX@
 
 # get the absolute path of this script

diff --git a/src/salt_instrument_flang_plugin.cpp b/src/salt_instrument_flang_plugin.cpp
@@ -47,7 +47,7 @@ limitations under the License.
 // TODO Put debug output behind verbose flag
 
 #define SALT_FORTRAN_CONFIG_FILE_VAR "SALT_FORTRAN_CONFIG_FILE"
-#define SALT_FORTRAN_CONFIG_DEFAULT_PATH "config_files/fortran_config.yaml"
+#define SALT_FORTRAN_CONFIG_DEFAULT_PATH "config_files/tau_config.yaml"
 
 #define SALT_FORTRAN_KEY "Fortran"
 #define SALT_FORTRAN_PROGRAM_BEGIN_KEY "program_insert"