move btx_interval back to xprof

argonne-lcf · Nov 2, 2023 · c3fc683 · c3fc683
1 parent 4e3e42d
commit c3fc683
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/hip/Makefile.am b/hip/Makefile.am
@@ -161,18 +161,17 @@ BTX_HIP_GENERATED = \
 
 EXTRA_DIST = \
 	$(top_srcdir)/utils/babeltrace_to_metababel_model.rb \
-	$(top_srcdir)/utils/btx_interval_model.yaml \
+	$(top_srcdir)/xprof/btx_interval_model.yaml \
 	btx_hipmatching_model.yaml
 
 CLEANFILES = \
-	btx_hip_model.yaml \
-	btx_interval_model.yaml
+	btx_hip_model.yaml
 
 btx_hip_model.yaml: $(top_srcdir)/utils/babeltrace_to_metababel_model.rb hip_babeltrace_model.yaml
 	SRC_DIR=$(srcdir) $(RUBY) $^ > $@
 
-$(BTX_HIP_GENERATED) &: $(top_srcdir)/utils/btx_interval_model.yaml btx_hipmatching_model.yaml btx_hip_model.yaml
-	$(METABABEL) -u btx_hip_model.yaml -d $(top_srcdir)/utils/btx_interval_model.yaml -t FILTER -o btx_filter_hip -p hipinterval -c interval --matching $(srcdir)/btx_hipmatching_model.yaml -i hip.h.include
+$(BTX_HIP_GENERATED) &: $(top_srcdir)/xprof/btx_interval_model.yaml btx_hipmatching_model.yaml btx_hip_model.yaml
+	$(METABABEL) -u btx_hip_model.yaml -d $(top_srcdir)/xprof/btx_interval_model.yaml -t FILTER -o btx_filter_hip -p hipinterval -c interval --matching $(srcdir)/btx_hipmatching_model.yaml -i hip.h.include
 
 $(MODIFIED_HIP_HDR) &: $(HIP_HDR) $(srcdir)/headers.patch
 	$(RM) -r modified_include/

diff --git a/xprof/Makefile.am b/xprof/Makefile.am
@@ -46,14 +46,14 @@ BTX_AGGREG_GENERATED = \
         btx_filter_aggreg/metababel/btx_downstream.c \
         btx_filter_aggreg/btx_main.c
 
-$(BTX_TIMELINE_GENERATED) &: $(top_srcdir)/utils/btx_interval_model.yaml btx_timeline_params.yaml
-	$(METABABEL) -u $(top_srcdir)/utils/btx_interval_model.yaml -t SINK -o btx_sink_timeline -p btx_timeline -c timeline --params $(srcdir)/btx_timeline_params.yaml
+$(BTX_TIMELINE_GENERATED) &: $(top_srcdir)/xprof/btx_interval_model.yaml btx_timeline_params.yaml
+	$(METABABEL) -u $(top_srcdir)/xprof/btx_interval_model.yaml -t SINK -o btx_sink_timeline -p btx_timeline -c timeline --params $(srcdir)/btx_timeline_params.yaml
 
 $(BTX_TALLY_GENERATED) &: btx_aggreg_model.yaml btx_tally_params.yaml
 	$(METABABEL) -u $(srcdir)/btx_aggreg_model.yaml -t SINK -o btx_sink_tally -p btx_tally -c tally --params $(srcdir)/btx_tally_params.yaml
 
-$(BTX_AGGREG_GENERATED) &: $(top_srcdir)/utils/btx_interval_model.yaml btx_aggreg_model.yaml btx_aggreg_params.yaml
-	$(METABABEL) -u $(top_srcdir)/utils/btx_interval_model.yaml -d $(srcdir)/btx_aggreg_model.yaml -t FILTER -o btx_filter_aggreg -p btx_aggreg -c aggreg --params $(srcdir)/btx_aggreg_params.yaml
+$(BTX_AGGREG_GENERATED) &: $(top_srcdir)/xprof/btx_interval_model.yaml btx_aggreg_model.yaml btx_aggreg_params.yaml
+	$(METABABEL) -u $(top_srcdir)/xprof/btx_interval_model.yaml -d $(srcdir)/btx_aggreg_model.yaml -t FILTER -o btx_filter_aggreg -p btx_aggreg -c aggreg --params $(srcdir)/btx_aggreg_params.yaml
 
 BUILT_SOURCES = \
 	$(BTX_TALLY_GENERATED) \
@@ -159,7 +159,7 @@ data_DATA = \
 EXTRA_DIST = \
 	interval.c.erb \
 	interval.h.erb \
-	$(top_srcdir)/utils/btx_interval_model.yaml \
+	$(top_srcdir)/xprof/btx_interval_model.yaml \
         btx_aggreg_model.yaml \
 	interval_model.yaml \
 	btx_timeline_params.yaml \

diff --git a/utils/btx_interval_model.yaml → xprof/btx_interval_model.yaml b/utils/btx_interval_model.yaml → xprof/btx_interval_model.yaml