ignore warnings

Signed-off-by: joejiong <1004691415qq@gmail.com>

ignore warnings

Signed-off-by: joejiong <1004691415qq@gmail.com>

ignore warnings

Signed-off-by: joejiong <1004691415qq@gmail.com>

separate test and build

Signed-off-by: joejiong <1004691415qq@gmail.com>

modify rights

Signed-off-by: joejiong <1004691415qq@gmail.com>

Add cmakelist export-bmv2 test target

Signed-off-by: joejiong <1004691415qq@gmail.com>

Folder structure

Signed-off-by: joejiong <1004691415qq@gmail.com>

align test

Signed-off-by: joejiong <1004691415qq@gmail.com>

thread 1

Signed-off-by: joejiong <1004691415qq@gmail.com>

clean cache

Signed-off-by: joejiong <1004691415qq@gmail.com>

more

Signed-off-by: joejiong <1004691415qq@gmail.com>

more

Signed-off-by: joejiong <1004691415qq@gmail.com>

more

Signed-off-by: joejiong <1004691415qq@gmail.com>

modify lit config

Signed-off-by: joejiong <1004691415qq@gmail.com>

fine tests

Signed-off-by: joejiong <1004691415qq@gmail.com>

recover cache

Signed-off-by: joejiong <1004691415qq@gmail.com>

git action cache changed script path, so I change the base address to workspace address

Signed-off-by: joejiong <1004691415qq@gmail.com>

clean

Signed-off-by: joejiong <1004691415qq@gmail.com>

new test

Signed-off-by: joejiong <1004691415qq@gmail.com>

clean

Signed-off-by: joejiong <1004691415qq@gmail.com>

disable gc, cause in future it is still need to merge to translate, somehow preserve the flow

Signed-off-by: joejiong <1004691415qq@gmail.com>

Author: Joejiong

.github/workflows/build-and-test.yml

@@ -61,9 +61,9 @@ jobs:
     # --------
 
     - name: Build and test MLIR
-      if: steps.cache-llvm.outputs.cache-hit != 'true'
       run: |
-        build_tools/build_mlir.sh
+        build_tools/build_mlir.sh 2>&1 | tee build_mlir.log  
+        cat build_mlir.log  
 
     # --------
     # Build and test P4MLIR.
@@ -72,3 +72,8 @@ jobs:
     - name: Build and test P4MLIR
       run: |
         build_tools/build_p4c_with_p4mlir_ext.sh
+    
+    - name: Run P4MLIR tests
+      run: |
+        build_tools/unittest.sh 2>&1 | tee unittest.log  
+        cat unittest.log  

build_tools/build_p4c_with_p4mlir_ext.sh

@@ -59,8 +59,4 @@ cd "$P4C_BUILD_DIR"
 cmake -G Ninja "$P4C_REPO_DIR" $CMAKE_FLAGS
 ninja
 
-# Run some tests
-ninja check-p4mlir
 
-# Install
-ninja install

build_tools/unittest.sh

@@ -0,0 +1,58 @@
+#!/usr/bin/env bash
+set -ex
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+echo "SCRIPT_DIR: $SCRIPT_DIR"
+
+SCRIPT_DIR="${GITHUB_WORKSPACE}/build_tools"
+
+echo "SCRIPT_DIR: $SCRIPT_DIR"
+
+P4MLIR_REPO_DIR=$( cd "$SCRIPT_DIR"/.. &> /dev/null && pwd )
+
+P4C_REPO_DIR=$P4MLIR_REPO_DIR/third_party/p4c
+P4C_BUILD_DIR=$P4C_REPO_DIR/build
+P4C_EXT_DIR=$P4C_REPO_DIR/extensions
+P4C_P4MLIR_EXT_DIR=$P4C_EXT_DIR/p4mlir
+LLVM_LIT="$P4MLIR_REPO_DIR/third_party/llvm-project/build/bin/llvm-lit"
+TEST_DIR="$P4MLIR_REPO_DIR/third_party/p4c/build/extensions/p4mlir/test"
+
+cd "$P4C_BUILD_DIR"
+echo "*********** Listing all available tests ***************"
+TEST_LIST=$($LLVM_LIT --show-tests "$TEST_DIR")
+
+TOTAL_TESTS=0
+PASSED_TESTS=0
+FAILED_TESTS=0
+
+TESTS=()
+while IFS= read -r line; do
+    TESTS+=("$line")
+done < <($LLVM_LIT --show-tests "$TEST_DIR" | grep "P4MLIR ::" | sed 's/^  P4MLIR :: //')
+
+for TEST_ITEM in "${TESTS[@]}"; do
+
+    FULL_TEST_PATH="$TEST_DIR/$TEST_ITEM"
+    
+    echo "Test Item: $TEST_ITEM"
+    echo "Full Test Path: $FULL_TEST_PATH"
+
+    TOTAL_TESTS=$((TOTAL_TESTS + 1))
+
+    if $LLVM_LIT -v "$FULL_TEST_PATH"; then
+        PASSED_TESTS=$((PASSED_TESTS + 1))
+        echo "PASSED"
+    else
+        FAILED_TESTS=$((FAILED_TESTS + 1))
+        echo "FAILED"
+    fi
+done
+
+
+echo "==== Test Summary ===="
+echo "Total tests: $TOTAL_TESTS"
+echo "Passed tests: $PASSED_TESTS"
+echo "Failed tests: $FAILED_TESTS"
+
+echo "==== Installing ===="
+ninja install

test/CMakeLists.txt

@@ -9,6 +9,7 @@ set(P4MLIR_TEST_DEPENDS
   FileCheck count not
   p4mlir-opt
   p4mlir-translate
+  p4mlir-export-bmv2
 )
 
 add_lit_testsuite(check-p4mlir "Running the P4MLIR regression tests"

test/Export/bool_test.mlir test/Export/BMV2/bool_test.mlirtest/Export/bool_test.mlir renamed to test/Export/BMV2/bool_test.mlir

@@ -4,4 +4,4 @@ module {
   %1 = p4hir.const #p4hir.bool<false> : !p4hir.bool
 }
 
-// CHECK: p4hir.const
+// CHECK: p4hir.const

test/lit.cfg.py

@@ -1,14 +1,7 @@
-# -*- Python -*-
-
 import os
 import platform
-import re
-import subprocess
-import tempfile
-
 import lit.formats
 import lit.util
-
 from lit.llvm import llvm_config
 from lit.llvm.subst import ToolSubst
 from lit.llvm.subst import FindTool
@@ -18,7 +11,9 @@
 # name: The name of this test suite.
 config.name = "P4MLIR"
 
-config.test_format = lit.formats.ShTest(not llvm_config.use_lit_shell)
+# Check if use_lit_shell exists, fallback to True if not
+use_lit_shell = getattr(llvm_config, "use_lit_shell", True)
+config.test_format = lit.formats.ShTest(not use_lit_shell)
 
 # suffixes: A list of file extensions to treat as test files.
 config.suffixes = [".mlir", ".p4"]
@@ -56,7 +51,7 @@
     "mlir-opt",
     "p4mlir-opt",
     "p4mlir-translate",
-    "p4mlir-export-bmv2",
+    "p4mlir-export-bmv2"
 ]
 
 llvm_config.add_tool_substitutions(tools, tool_dirs)

tools/p4mlir-export-bmv2/CMakeLists.txt

@@ -29,7 +29,7 @@ mlir_check_all_link_libraries(p4mlir-export-bmv2)
 
 add_custom_target(linkp4mlir_export_out
   COMMAND ${CMAKE_COMMAND} -E create_symlink 
-          ${P4MLIR_BINARY_DIR}/bin/p4mlir-export-bmv2 
+          ${P4MLIR_BINARY_DIR}/bin/p4mlir-export-bmv2
           ${P4C_BINARY_DIR}/p4mlir-export-bmv2
   COMMAND ${CMAKE_COMMAND} -E create_symlink 
           ${P4C_BINARY_DIR}/p4include 

tools/p4mlir-export-bmv2/json_emitter.cpp

@@ -10,10 +10,16 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-#include "json_emitter.h"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
 #include "p4mlir/Dialect/P4HIR/P4HIR_Dialect.h"
 #include "llvm/Support/JSON.h"
 #include "llvm/Support/raw_ostream.h"
+#pragma GCC diagnostic pop
+
+
+#include "json_emitter.h"
+
 
 using namespace llvm::json;
 

tools/p4mlir-export-bmv2/json_emitter.h

@@ -13,9 +13,13 @@ limitations under the License.
 #ifndef P4MLIR_JSON_EMITTER_H
 #define P4MLIR_JSON_EMITTER_H
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-parameter"
 #include "mlir/IR/BuiltinOps.h"
 #include "mlir/IR/Operation.h"
 #include "llvm/Support/JSON.h"
+#pragma GCC diagnostic pop
+
 
 namespace P4::P4MLIR {
 

tools/p4mlir-export-bmv2/p4mlir-export-bmv2.cpp

@@ -16,6 +16,12 @@ limitations under the License.
 #include <iostream>
 #include "options.h"
 
+#if HAVE_LIBGC
+extern "C" {
+    #include "gc.h"
+}
+#endif
+
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #include "mlir/IR/OperationSupport.h"
@@ -27,8 +33,14 @@ limitations under the License.
 #include "json_emitter.h"
 
 
+
+
 int main(int argc, char *const argv[]) {
 
+#if HAVE_LIBGC
+    GC_disable();
+#endif
+
     P4::AutoCompileContext autoP4MLIRExportContext(new P4::MLIR::ExportContext);
     auto &options = P4::MLIR::ExportContext::get().options();
     options.langVersion = P4::CompilerOptions::FrontendVersion::P4_16;