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

@@ -33,22 +33,22 @@ jobs:
     # Build and test MLIR. Use cache when available.
     # --------
 
-    # - name: Get LLVM hash
-    #   id: get-llvm-hash
-    #   run: echo "hash=$(git rev-parse @:./third_party/llvm-project)" >> $GITHUB_OUTPUT
+    - name: Get LLVM hash
+      id: get-llvm-hash
+      run: echo "hash=$(git rev-parse @:./third_party/llvm-project)" >> $GITHUB_OUTPUT
 
-    # - name: Get workflow hash
-    #   id: get-workflow-hash
-    #   run: echo "hash=$(md5sum $GITHUB_WORKSPACE/.github/workflows/build-and-test.yml | awk '{print $1}')" >> $GITHUB_OUTPUT
+    - name: Get workflow hash
+      id: get-workflow-hash
+      run: echo "hash=$(md5sum $GITHUB_WORKSPACE/.github/workflows/build-and-test.yml | awk '{print $1}')" >> $GITHUB_OUTPUT
 
-    # - name: Cache LLVM
-    #   id: cache-llvm
-    #   uses: actions/cache@v3
-    #   with:
-    #     path: |
-    #       third_party/llvm-project/build/bin/llvm-lit
-    #       install
-    #     key: ${{ runner.os }}-llvm-${{ steps.get-llvm-hash.outputs.hash }}-${{ steps.get-workflow-hash.outputs.hash }}
+    - name: Cache LLVM
+      id: cache-llvm
+      uses: actions/cache@v3
+      with:
+        path: |
+          third_party/llvm-project/build/bin/llvm-lit
+          install
+        key: ${{ runner.os }}-llvm-${{ steps.get-llvm-hash.outputs.hash }}-${{ steps.get-workflow-hash.outputs.hash }}
 
     - name: Install requirements
       run: |

build_tools/unittest.sh

@@ -1,18 +1,58 @@
+#!/usr/bin/env bash
 set -ex
 
-# https://stackoverflow.com/a/246128
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )  # p4mlir/build_tools
+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"
-# Run some tests
-ninja check-p4mlir -j1
+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"
 
-# Install
+echo "==== Installing ===="
 ninja install

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/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;