Disable rule verification job and adapt benchmark job

DataDog · Jan 4, 2024 · 4c3211e · 4c3211e
1 parent 4fa9ddf
commit 4c3211e
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 33 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -219,30 +219,30 @@ jobs:
         run: VERBOSE=1 make -j $(nproc) verify_rule verify_ruleset waf_runner validate_schema
         working-directory: Debug
 
-  verify_ruleset:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
-
-      - name: Create directories
-        run: mkdir Debug
-
-      - name: CMake
-        env:
-          CC: gcc-12
-          CXX: g++-12
-        run: |
-          cmake .. -DCMAKE_BUILD_TYPE=Debug 
-        working-directory: Debug
-
-      - name: Build
-        run: VERBOSE=1 make -j $(nproc) verify_ruleset proj_event_rules
-        working-directory: Debug
-
-      - name: Verify
-        run: ./tools/verify_ruleset ./third_party/proj_event_rules-prefix/src/proj_event_rules/build/recommended.json
-        working-directory: Debug
+  #verify_ruleset:
+    #runs-on: ubuntu-latest
+    #strategy:
+      #fail-fast: false
+    #steps:
+      #- uses: actions/checkout@v3
+        #with:
+          #submodules: recursive
+
+      #- name: Create directories
+        #run: mkdir Debug
+
+      #- name: CMake
+        #env:
+          #CC: gcc-12
+          #CXX: g++-12
+        #run: |
+          #cmake .. -DCMAKE_BUILD_TYPE=Debug 
+        #working-directory: Debug
+
+      #- name: Build
+        #run: VERBOSE=1 make -j $(nproc) verify_ruleset proj_event_rules
+        #working-directory: Debug
+
+      #- name: Verify
+        #run: ./tools/verify_ruleset ./third_party/proj_event_rules-prefix/src/proj_event_rules/build/recommended.json
+        #working-directory: Debug
diff --git a/perf/CMakeLists.txt b/perf/CMakeLists.txt
@@ -30,18 +30,13 @@ set_target_properties(benchmerge PROPERTIES
     CXX_EXTENSIONS NO)
 
 
-ExternalProject_Get_property(proj_event_rules SOURCE_DIR)
-set(EVENT_RULES_SOURCE_DIR ${SOURCE_DIR})
-
 add_custom_target(run_benchmark
     COMMAND ${CMAKE_BINARY_DIR}/perf/benchmark
-    --rule-repo=${EVENT_RULES_SOURCE_DIR}
+    --scenarios=${CMAKE_CURRENT_SOURCE_DIR}/scenarios
     --iterations=100
     --format=cbmf
     --seed=1729
     --output=benchmark_results.json
     --raw
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
 )
-
-add_dependencies(run_benchmark benchmark proj_event_rules)