Add model to tests compare (#352)

Author: TApplencourt

.github/workflows/presubmit.yml

@@ -213,12 +213,12 @@ jobs:
         working-directory: base_branch/build
         run: |
           make -j `nproc` -C utils lttng/tracepoint_gen.h
-          make -j `nproc` -C mpi tracer_mpi.c mpi_library.rb libmpi.la
-          make -j `nproc` -C omp tracer_ompt.c omp_library.rb
-          make -j `nproc` -C hip tracer_hip.c hip_library.rb  libamdhip64.la
-          make -j `nproc` -C cuda tracer_cuda.c cuda_library.rb libcuda.la
+          make -j `nproc` -C mpi tracer_mpi.c mpi_library.rb mpi_babeltrace_model.yaml libmpi.la
+          make -j `nproc` -C omp tracer_ompt.c omp_babeltrace_model.yaml omp_library.rb
+          make -j `nproc` -C hip tracer_hip.c hip_library.rb hip_babeltrace_model.yaml libamdhip64.la
+          make -j `nproc` -C cuda tracer_cuda.c cuda_library.rb cuda_babeltrace_model.yaml libcuda.la
           make -j `nproc` -C cuda tracer_cudart.c libcudart.la
-          make -j `nproc` -C ze tracer_ze.c ze_library.rb libze_loader.la
+          make -j `nproc` -C ze tracer_ze.c ze_library.rb ze_babeltrace_model.yaml libze_loader.la
           make -j `nproc` -C opencl libOpenCL.la
       # Chekout, Configure and build PR branch files
       - name: Checkout PR branch
@@ -237,12 +237,12 @@ jobs:
         working-directory: pr_branch/build
         run: |
           make -j `nproc` -C utils lttng/tracepoint_gen.h
-          make -j `nproc` -C mpi tracer_mpi.c mpi_library.rb libmpi.la
-          make -j `nproc` -C omp tracer_ompt.c omp_library.rb
-          make -j `nproc` -C hip tracer_hip.c hip_library.rb  libamdhip64.la
-          make -j `nproc` -C cuda tracer_cuda.c cuda_library.rb libcuda.la
+          make -j `nproc` -C mpi tracer_mpi.c mpi_library.rb mpi_babeltrace_model.yaml libmpi.la
+          make -j `nproc` -C omp tracer_ompt.c omp_babeltrace_model.yaml omp_library.rb
+          make -j `nproc` -C hip tracer_hip.c hip_library.rb hip_babeltrace_model.yaml libamdhip64.la
+          make -j `nproc` -C cuda tracer_cuda.c cuda_library.rb cuda_babeltrace_model.yaml libcuda.la
           make -j `nproc` -C cuda tracer_cudart.c libcudart.la
-          make -j `nproc` -C ze tracer_ze.c ze_library.rb libze_loader.la
+          make -j `nproc` -C ze tracer_ze.c ze_library.rb ze_babeltrace_model.yaml libze_loader.la
           make -j `nproc` -C opencl libOpenCL.la
       # Run comparison script
       - name: Compare files

utils/test_compare_generated_file.py

@@ -8,31 +8,28 @@
 stems = [os.environ["THAPI_REF"], os.environ["THAPI_NEW"]]
 
 filenames = []
-filenames += ["mpi/tracer_mpi.c", "mpi/mpi_library.rb"]
+filenames += ["mpi/tracer_mpi.c", "mpi/mpi_library.rb", "mpi/mpi_babeltrace_model.yaml"]
 # filenames += ["mpi/mpi_api.yaml"]
-filenames += ["mpi/mpi_tracepoints.tp"]
 
-filenames += ["omp/tracer_ompt.c", "omp/omp_library.rb"]
+filenames += ["omp/tracer_ompt.c", "omp/omp_library.rb", "omp/omp_babeltrace_model.yaml"]
 # filenames += ["omp/ompt_api.yaml"]
 
-filenames += ["hip/tracer_hip.c", "hip/hip_library.rb"]
+filenames += ["hip/tracer_hip.c", "hip/hip_library.rb", "hip/hip_babeltrace_model.yaml"]
 # filenames += ["hip/hip_api.yaml"]
 
-filenames += ["cuda/tracer_cuda.c", "cuda/cuda_library.rb"]
+filenames += ["cuda/tracer_cuda.c", "cuda/cuda_library.rb", "cuda/cuda_babeltrace_model.yaml"]
 # filenames += ["cuda/cuda_api.yaml"]
 
-filenames += ["cuda/tracer_cudart.c"]
-# filenames += ["cuda/cudart_api.yaml"]
+filenames += ["cuda/tracer_cudart.c", "cuda/cudart_api.yaml"]
 
-filenames += ["ze/tracer_ze.c", "ze/ze_library.rb"]
+filenames += ["ze/tracer_ze.c", "ze/ze_library.rb", "ze/ze_babeltrace_model.yaml"]
 # filenames += [
 #    "ze/ze_api.yaml",
 #    "ze/zes_api.yaml",
 #    "ze/zel_api.yaml",
 #    "ze/zex_api.yaml",
 # ]
 
-
 def load_file(path):
     with open(path, "r") as f:
         if path.endswith("yaml"):