diff --git a/CMakeLists.txt b/CMakeLists.txt index e3e077b..5101802 100644 --- 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 deleted file mode 120000 index d7cf882..0000000 --- a/config_files/fortran_config.yaml +++ /dev/null @@ -1 +0,0 @@ -tau_fortran_config.yaml \ No newline at end of file diff --git a/config_files/tau_fortran_config.yaml b/config_files/tau_fortran_config.yaml deleted file mode 100644 index cc87b4a..0000000 --- a/config_files/tau_fortran_config.yaml +++ /dev/null @@ -1,23 +0,0 @@ -Fortran: -# Config variables: -# ${full_timer_name}: "procedure_name [file_path {start}-{end}]" - instrumentation: tauFortran - program_insert: - - " integer, save :: tauProfileTimer(2) = [0, 0]" - - " call TAU_PROFILE_INIT()" - - " call TAU_PROFILE_TIMER(tauProfileTimer, \"${full_timer_name}&" - - " &\")" - - " call TAU_PROFILE_START(tauProfileTimer)" - - "#ifndef TAU_MPI" - - " call TAU_PROFILE_SET_NODE(0)" - - "#endif" - - - procedure_begin_insert: - - " integer, save :: tauProfileTimer(2) = [0, 0]" - - " call TAU_PROFILE_TIMER(tauProfileTimer, \"${full_timer_name}&" - - " &\")" - - " call TAU_PROFILE_START(tauProfileTimer)" - - procedure_end_insert: - - " call TAU_PROFILE_STOP(tauProfileTimer)" diff --git a/src/fparse-llvm.in b/src/fparse-llvm.in index 28a32dd..1c3328f 100755 --- 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 index c295cd4..37c52e9 100644 --- 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"