Trim runtime trace plumbing

Author: sbryngelson

src/common/m_trace.f90

@@ -5,22 +5,19 @@
 !> @brief Simple runtime call tracing helpers.
 module m_trace
 
-    use iso_fortran_env, only: output_unit
-
     implicit none
 
     private
-    public :: s_trace_enter, s_trace_call, s_trace_global_call, s_trace_point_begin, s_trace_point_end
-
-    logical, private           :: trace_initialized = .false.
-    logical, private           :: trace_enabled = .false.
-    logical, private           :: trace_point_enabled = .false.
-    logical, private           :: trace_point_middle = .false.
-    integer, private           :: trace_j = 0
-    integer, private           :: trace_k = 0
-    integer, private           :: trace_l = 0
-    integer, private           :: trace_point_depth = 0
-    character(len=64), private :: trace_point_vars = ''
+    public :: s_trace_point_begin, s_trace_point_end
+
+    logical, private :: trace_initialized = .false.
+    logical, private :: trace_enabled = .false.
+    logical, private :: trace_point_enabled = .false.
+    logical, private :: trace_point_middle = .false.
+    integer, private :: trace_j = 0
+    integer, private :: trace_k = 0
+    integer, private :: trace_l = 0
+    integer, private :: trace_point_depth = 0
 
     interface
         subroutine c_trace_point_begin() bind(C, name="mfc_trace_point_begin")
@@ -70,78 +67,27 @@ subroutine s_initialize_trace
             end if
         end if
 
-        call get_environment_variable('MFC_TRACE_POINT_VARS', env_value, length=env_len)
-        if (env_len > 0) trace_point_vars = trim(env_value(:env_len))
-
         trace_initialized = .true.
 
     end subroutine s_initialize_trace
 
-    !> Emit a live call-trace line when MFC_TRACE is enabled.
-    subroutine s_trace_enter(name)
-
-        character(len=*), intent(in) :: name
-
-        call s_initialize_trace()
-
-        if (.not. trace_enabled) return
-        if (trace_point_enabled .and. trace_point_depth <= 0) return
-
-        write (output_unit, '(A,A)') 'TRACE ', trim(name)
-        call flush (output_unit)
-
-    end subroutine s_trace_enter
-
-    !> Emit a live call-site trace when the current trace scope is active.
-    subroutine s_trace_call(name)
-
-        character(len=*), intent(in) :: name
-
-        call s_initialize_trace()
-
-        if (.not. trace_enabled) return
-        if (trace_point_enabled .and. trace_point_depth <= 0) return
-
-        write (output_unit, '(A,A)') 'TRACE ', trim(name)
-        call flush (output_unit)
-
-    end subroutine s_trace_call
-
-    !> Emit a call-site trace even when point tracing has not entered a cell loop yet.
-    subroutine s_trace_global_call(name)
-
-        character(len=*), intent(in) :: name
-
-        call s_initialize_trace()
-
-        if (.not. trace_enabled) return
-
-        write (output_unit, '(A,A)') 'TRACE ', trim(name)
-        call flush (output_unit)
-
-    end subroutine s_trace_global_call
-
     !> Enable nested routine-entry tracing while a call at MFC_TRACE_POINT executes.
-    subroutine s_trace_point_begin(j, k, l, vars, mid_j, mid_k, mid_l)
-
-        integer, intent(in)          :: j
-        integer, intent(in)          :: k
-        integer, intent(in)          :: l
-        character(len=*), intent(in) :: vars
-        integer, intent(in)          :: mid_j
-        integer, intent(in)          :: mid_k
-        integer, intent(in)          :: mid_l
-        integer                      :: target_j
-        integer                      :: target_k
-        integer                      :: target_l
+    subroutine s_trace_point_begin(j, k, l, mid_j, mid_k, mid_l)
+
+        integer, intent(in) :: j
+        integer, intent(in) :: k
+        integer, intent(in) :: l
+        integer, intent(in) :: mid_j
+        integer, intent(in) :: mid_k
+        integer, intent(in) :: mid_l
+        integer             :: target_j
+        integer             :: target_k
+        integer             :: target_l
 
         call s_initialize_trace()
 
         if (.not. trace_enabled) return
         if (.not. trace_point_enabled) return
-        if (len_trim(trace_point_vars) > 0 .and. trim(trace_point_vars) /= 'any') then
-            if (trim(vars) /= trim(trace_point_vars)) return
-        end if
         if (trace_point_middle) then
             target_j = mid_j
             target_k = mid_k

toolchain/instrument_fortran_trace.py

@@ -205,8 +205,7 @@ def point_begin_line(indent: str, point_vars: tuple[str, str, str], loop_stack:
     for var in point_vars:
         entry = active[var]
         midpoint_args.append(f"int(({entry['lower']}) + ({entry['upper']}))/2")
-    point_names = ",".join(point_vars)
-    return f"{indent}call s_trace_point_begin({point_args}, '{point_names}', {', '.join(midpoint_args)})\n"
+    return f"{indent}call s_trace_point_begin({point_args}, {', '.join(midpoint_args)})\n"
 
 
 def instrument(lines: list[str], point_traces: bool = True) -> list[str]:

toolchain/mfc/run/run.py

@@ -64,7 +64,7 @@ def __profiler_prepend() -> typing.List[str]:
 def __runner_prepend() -> typing.List[str]:
     profiler = __profiler_prepend()
 
-    if __runtime_trace_requested() and ARG("gpu") in (gpuConfigOptions.ACC.value, gpuConfigOptions.MP.value):
+    if ARG("runtime_trace", False) and ARG("gpu") != gpuConfigOptions.NONE.value:
         return ["python3", os.path.join(MFC_ROOT_DIR, "toolchain", "mfc", "run", "trace.py")] + profiler
 
     return profiler
@@ -74,10 +74,6 @@ def get_baked_templates() -> dict:
     return {os.path.splitext(os.path.basename(f))[0]: file_read(f) for f in glob(os.path.join(MFC_TEMPLATE_DIR, "*.mako"))}
 
 
-def __runtime_trace_requested() -> bool:
-    return ARG("runtime_trace", False)
-
-
 def __job_script_filepath() -> str:
     return os.path.abspath(os.sep.join([os.path.dirname(ARG("input")), f"{ARG('name')}.{'bat' if os.name == 'nt' else 'sh'}"]))
 
@@ -99,6 +95,11 @@ def __get_template() -> Template:
 
 
 def __generate_job_script(targets, case: input.MFCInputFile):
+    env = {}
+    if ARG("gpus") is not None:
+        gpu_ids = ",".join([str(_) for _ in ARG("gpus")])
+        env.update({"CUDA_VISIBLE_DEVICES": gpu_ids, "HIP_VISIBLE_DEVICES": gpu_ids})
+
     # Compute GPU mode booleans for templates
     gpu_mode = ARG("gpu")
 
@@ -111,11 +112,7 @@ def __generate_job_script(targets, case: input.MFCInputFile):
     gpu_acc = gpu_mode == gpuConfigOptions.ACC.value
     gpu_mp = gpu_mode == gpuConfigOptions.MP.value
 
-    env = {}
-    if ARG("gpus") is not None:
-        gpu_ids = ",".join([str(_) for _ in ARG("gpus")])
-        env.update({"CUDA_VISIBLE_DEVICES": gpu_ids, "HIP_VISIBLE_DEVICES": gpu_ids})
-    if __runtime_trace_requested():
+    if ARG("runtime_trace", False):
         trace_file = os.path.abspath(os.path.join(os.path.dirname(ARG("input")), "trace.log"))
         with open(trace_file, "w", encoding="utf-8"):
             pass