Merge pull request #307 from DeepWok/cx/remove-hardware

Cx/remove hardware

Author: bingleilou

.github/workflows/buildAndTest.yml

@@ -220,117 +220,8 @@ jobs:
           if-no-files-found: error 
           overwrite: true 
 
-  hardware-test:
-    runs-on: ubuntu-latest
-    container:
-      image: bingleilou/mase-docker-cpu-triton:latest
-    steps:
-
-      # -----------
-      # Clone the MASE repo and its submodules.
-      # -----------
-
-      - name: Get MASE
-        uses: actions/checkout@v3
-        with:
-            submodules: "true"
-
-      - name: Set git safe
-        run: |
-          git config --global --add safe.directory $PWD
-
-      # Choose the git commit to diff against for the purposes of linting.
-      # Since this workflow is triggered on both pushes and pull requests, w
-      # have to determine if the pull request target branch is set (which it
-      # will only be on the PR triggered flow). If it's not, then compare
-      # against the last commit.
-
-      - name: choose-commit
-        if: ${{ always() }}
-        env:
-          # Base ref is the target branch, in text form (not hash)
-          PR_BASE: ${{ github.base_ref }}
-        run: |
-          # Run clang-format
-          if [ -z "$PR_BASE" ]; then
-            DIFF_COMMIT_NAME="HEAD^"
-          else
-            DIFF_COMMIT_NAME="$PR_BASE"
-          fi
-          echo "DIFF_COMMIT_NAME=$DIFF_COMMIT_NAME" >> $GITHUB_ENV
-
-      # Since we did a shallow fetch for this repo, we must fetch the commit
-      # upon which we be diff'ing. The last step set the ref name in the
-      # $DIFF_COMMIT_NAME environment variable. When running the fetch, resolve
-      # it to the commit hash and pass that hash along to subsequent steps.
-
-      - name: git fetch base commit
-        continue-on-error: true
-        run: |
-          if echo "$DIFF_COMMIT_NAME" | grep -q HEAD; then
-            DIFF_COMMIT_SHA=$( git rev-parse $DIFF_COMMIT_NAME )
-          else
-            git fetch --recurse-submodules=no origin $DIFF_COMMIT_NAME
-            DIFF_COMMIT_SHA=$( git rev-parse origin/$DIFF_COMMIT_NAME )
-          fi
-          echo "DIFF_COMMIT=$DIFF_COMMIT_SHA" >> $GITHUB_ENV
-      
-      # Run verible-verilog-format to check Verilog/SystemVerilog formatting.
-      - name: verilog-format
-        if: ${{ always() }}
-        shell: bash
-        run: |
-          files=$(git diff --name-only $DIFF_COMMIT | grep -e '\.sv$' || echo -n)
-          if [[ ! -z $files ]]; then
-            for f in $files
-            do
-              if [[ -f $f ]]; then
-                echo $f
-                /srcPkgs/verible/bin/verible-verilog-format $f | diff - $f
-              fi
-            done
-          fi
-          files=$(git diff --name-only $DIFF_COMMIT | grep -e '\.v$' || echo -n)
-          if [[ ! -z $files ]]; then
-            for f in $files
-            do
-              if [[ -f $f ]]; then
-                echo $f
-                /srcPkgs/verible/bin/verible-verilog-format $f | diff - $f
-              fi
-            done
-          fi
-
-      # -----------
-      # Hardware regression test 
-      # -----------
-      
-      - name: Hardware regression test 
-        run: |
-            pip3 --version 
-            python3 --version
-            echo "PYTHONPATH is ${PYTHONPATH}"
-            export PYTHONPATH=$PYTHONPATH:$PWD/src
-            just test-hw
-            # if [ ! -f hardware_report.xml ]; then
-            #   echo "hardware_report.xml not found!"
-            #   ls
-            #   exit 1
-            # fi
-
-      # -----------
-      # TODO: Upload hardware regression test artifacts 
-      # -----------
-      # - name: Upload hardware test report
-      #   uses: actions/upload-artifact@v4
-      #   with:
-      #     name: hardware_report 
-      #     path: hardware_report.xml
-      #     if-no-files-found: error 
-      #     overwrite: true 
-
   build-doc:
-    needs: [software-test, hardware-test]
+    needs: [software-test]
     runs-on: ubuntu-latest
     container:
       image: bingleilou/mase-docker-cpu-triton:latest
@@ -387,5 +278,3 @@ jobs:
           else
             echo "Skipped MASE Doc deployment."
           fi
-
-

Makefile

@@ -1,9 +1,6 @@
-vhls=/mnt/applications/Xilinx/23.1
-vhls_version=2023.1
 local ?= 0
 
 GPU_AVAILABLE := $(shell command -v nvidia-smi 2> /dev/null)
-VIVADO_AVAILABLE := $(shell command -v vivado 2> /dev/null)
 
 # * Check if a GPU is available
 ifeq ($(GPU_AVAILABLE),)
@@ -12,14 +9,6 @@ else
     PLATFORM := gpu
 endif
 
-# * Mount Vivado HLS path only if Vivado is available (to avoid path not found errors)
-# Include shared folder containing board files etc
-ifeq ($(VIVADO_AVAILABLE),)
-    DOCKER_RUN_EXTRA_ARGS=
-else
-    DOCKER_RUN_EXTRA_ARGS= -v /mnt/applications/:/mnt/applications -v $(vhls):$(vhls)
-endif
-
 # * Set docker image according to local flag
 # * If local is set, should run locally built image
 # * Otherwise pull from dockerhub
@@ -39,7 +28,6 @@ endif
 coverage=test/
 
 sw_test_dir = test/
-hw_test_dir = src/mase_components/
 
 NUM_WORKERS ?= 1
 
@@ -48,19 +36,13 @@ sync:
 	git submodule sync
 	git submodule update --init --recursive
 
-# Only needed if you are using the MLIR flow - it will be slow!
-sync-mlir:
-	bash mlir-air/utils/github-clone-build-libxaie.sh
-	bash mlir-air/utils/clone-llvm.sh
-	bash mlir-air/utils/clone-mlir-aie.sh
-
 # Build Docker container
 build-docker:
 	if [ $(local) -eq 1 ]; then \
 		if [ ! -d Docker ]; then \
     			git clone git@github.com:jianyicheng/mase-docker.git Docker; \
 		fi; \
-		docker build --build-arg VHLS_PATH=$(vhls) --build-arg VHLS_VERSION=$(vhls_version) -f Docker/Dockerfile-$(PLATFORM) --tag mase-ubuntu2204 Docker; \
+		docker build -f Docker/Dockerfile-$(PLATFORM) --tag mase-ubuntu2204 Docker; \
 	else \
 		docker pull $(img); \
 	fi
@@ -72,16 +54,8 @@ shell:
         -v /$(USER_PREFIX)/$(shell whoami)/.gitconfig:/root/.gitconfig \
         -v /$(USER_PREFIX)/$(shell whoami)/.ssh:/root/.ssh \
         -v /$(USER_PREFIX)/$(shell whoami)/.mase:/root/.mase:z \
-        $(DOCKER_RUN_EXTRA_ARGS) \
         $(img) /bin/bash
 
-test-hw:
-	pytest --log-level=DEBUG --verbose \
-		-n $(NUM_WORKERS) \
-		--junitxml=hardware_report.xml \
-		--html=report.html --self-contained-html \
-		$(hw_test_dir)
-
 test-sw:
 	pytest --log-level=DEBUG --verbose \
 		-n $(NUM_WORKERS) \
@@ -92,21 +66,13 @@ test-sw:
 		--profile --profile-svg \
 		$(sw_test_dir)
 
-test-all: test-hw test-sw
+test-all: test-sw
 	mkdir -p ./tmp
 	(cd tmp; python3 ../scripts/test-torch-mlir.py || exit 1)
 
 build:
 	bash scripts/build-llvm.sh || exit 1
-	bash scripts/build-mase-hls.sh || exit 1
-
-build-aie:
-	bash scripts/build-aie.sh || exit 1
-	bash scripts/build-air.sh || exit 1
 
 clean:
 	rm -rf llvm
-	rm -rf aienginev2 mlir-air/build mlir-aie
-	rm -rf hls/build
-	rm -rf vck190_air_sysroot
 	rm -rf tmp mase_output