merge upstream and resolve deleted file conflict

Udit8348 · Oct 21, 2024 · f184b57 · f184b57
2 parents d584e7b + 5d7e53f
commit f184b57
Show file tree

Hide file tree

Showing 325 changed files with 11,160 additions and 25,987 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,13 +21,13 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
         with:
           submodules: recursive
 
       - name: Cache Toolchain Directory
         id: cache-toolchain
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         with:
           path: tools
           key: ${{ runner.os }}-toolchain-v0.1
@@ -36,7 +36,7 @@ jobs:
 
       - name: Cache Third Party Directory
         id: cache-thirdparty
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         with:
           path: third_party
           key: ${{ runner.os }}-thirdparty-v0.1
@@ -46,7 +46,7 @@ jobs:
       - name: Install Dependencies
         if: steps.cache-toolchain.outputs.cache-hit != 'true' || steps.cache-thirdparty.outputs.cache-hit != 'true'
         run: |
-          sudo bash ./ci/system_updates.sh
+          sudo bash ./ci/install_dependencies.sh
 
       - name: Setup Toolchain
         if: steps.cache-toolchain.outputs.cache-hit != 'true'
@@ -62,111 +62,7 @@ jobs:
         run: |
           make -C third_party > /dev/null
 
-  # build:
-  #   runs-on: ubuntu-20.04
-  #   needs: setup
-  #   strategy:
-  #     matrix:
-  #       xlen: [32, 64]
-
-  #   steps:
-  #     - name: Checkout code
-  #       uses: actions/checkout@v2
-
-  #     - name: Install Dependencies
-  #       run: |
-  #         sudo bash ./ci/system_updates.sh
-
-  #     - name: Cache Toolchain Directory
-  #       id: cache-toolchain
-  #       uses: actions/cache@v2
-  #       with:
-  #         path: tools
-  #         key: ${{ runner.os }}-toolchain-v0.1
-  #         restore-keys: |
-  #           ${{ runner.os }}-toolchain-
-
-  #     - name: Cache Third Party Directory
-  #       id: cache-thirdparty
-  #       uses: actions/cache@v2
-  #       with:
-  #         path: third_party
-  #         key: ${{ runner.os }}-thirdparty-v0.1
-  #         restore-keys: |
-  #           ${{ runner.os }}-thirdparty-
-
-  #     - name: Run Build
-  #       run: |
-  #         TOOLDIR=$PWD/tools
-  #         mkdir -p build${{ matrix.xlen }}
-  #         cd build${{ matrix.xlen }}
-  #         ../configure --tooldir=$TOOLDIR --xlen=${{ matrix.xlen }}
-  #         source ci/toolchain_env.sh
-  #         make software -s > /dev/null
-  #         make tests -s > /dev/null
-
-  #     - name: Upload Build Artifact
-  #       uses: actions/upload-artifact@v2
-  #       with:
-  #         name: build-${{ matrix.xlen }}
-  #         path: build${{ matrix.xlen }}
-
-  # tests:
-  #   runs-on: ubuntu-20.04
-  #   needs: build
-  #   strategy:
-  #     matrix:
-  #       name: [regression, opencl, config1, config2, debug, stress]
-  #       xlen: [32, 64]
-
-  #   steps:
-  #     - name: Checkout code
-  #       uses: actions/checkout@v2
-
-  #     - name: Install Dependencies
-  #       run: |
-  #         sudo bash ./ci/system_updates.sh
-
-  #     - name: Cache Toolchain Directory
-  #       id: cache-toolchain
-  #       uses: actions/cache@v2
-  #       with:
-  #         path: tools
-  #         key: ${{ runner.os }}-toolchain-v0.1
-  #         restore-keys: |
-  #           ${{ runner.os }}-toolchain-
-
-  #     - name: Cache Third Party Directory
-  #       id: cache-thirdparty
-  #       uses: actions/cache@v2
-  #       with:
-  #         path: third_party
-  #         key: ${{ runner.os }}-thirdparty-v0.1
-  #         restore-keys: |
-  #           ${{ runner.os }}-thirdparty-
-
-  #     - name: Download Build Artifact
-  #       uses: actions/download-artifact@v2
-  #       with:
-  #         name: build-${{ matrix.xlen }}
-  #         path: build${{ matrix.xlen }}
-
-  #     - name: Run tests
-  #       run: |
-  #         cd build${{ matrix.xlen }}
-  #         source ci/toolchain_env.sh
-  #         chmod -R +x . # Ensure all files have executable permissions
-  #         if [ "${{ matrix.name }}" == "regression" ]; then
-  #           ./ci/regression.sh --unittest
-  #           ./ci/regression.sh --isa
-  #           ./ci/regression.sh --kernel
-  #           ./ci/regression.sh --synthesis
-  #           ./ci/regression.sh --regression
-  #         else
-  #           ./ci/regression.sh --${{ matrix.name }}
-  #         fi
-
-  build_vm:
+  build:
     runs-on: ubuntu-20.04
     needs: setup
     strategy:
@@ -175,15 +71,15 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
 
       - name: Install Dependencies
         run: |
-          sudo bash ./ci/system_updates.sh
+          sudo bash ./ci/install_dependencies.sh
 
       - name: Cache Toolchain Directory
         id: cache-toolchain
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         with:
           path: tools
           key: ${{ runner.os }}-toolchain-v0.1
@@ -192,7 +88,7 @@ jobs:
 
       - name: Cache Third Party Directory
         id: cache-thirdparty
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         with:
           path: third_party
           key: ${{ runner.os }}-thirdparty-v0.1
@@ -202,39 +98,39 @@ jobs:
       - name: Run Build
         run: |
           TOOLDIR=$PWD/tools
-          mkdir -p build${{ matrix.xlen }}-vm
-          cd build${{ matrix.xlen }}-vm
-          ../configure --tooldir=$TOOLDIR --xlen=${{ matrix.xlen }} --vm_enable=1
+          mkdir -p build${{ matrix.xlen }}
+          cd build${{ matrix.xlen }}
+          ../configure --tooldir=$TOOLDIR --xlen=${{ matrix.xlen }}
           source ci/toolchain_env.sh
           make software -s > /dev/null
           make tests -s > /dev/null
 
       - name: Upload Build Artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
-          name: build-${{ matrix.xlen }}-vm
-          path: build${{ matrix.xlen }}-vm
+          name: build-${{ matrix.xlen }}
+          path: build${{ matrix.xlen }}
 
-  test_vm:
+  tests:
     runs-on: ubuntu-20.04
-    needs: build_vm
+    needs: build
     strategy:
       fail-fast: false
       matrix:
-        name: [regression, opencl, cache, config1, config2, debug, stress, vm]
+        name: [regression, opencl, cache, config1, config2, debug, scope, stress, synthesis, vm]
         xlen: [32, 64]
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
 
       - name: Install Dependencies
         run: |
-          sudo bash ./ci/system_updates.sh
+          sudo bash ./ci/install_dependencies.sh
 
       - name: Cache Toolchain Directory
         id: cache-toolchain
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         with:
           path: tools
           key: ${{ runner.os }}-toolchain-v0.1
@@ -243,29 +139,36 @@ jobs:
 
       - name: Cache Third Party Directory
         id: cache-thirdparty
-        uses: actions/cache@v4
+        uses: actions/cache@v2
         with:
           path: third_party
           key: ${{ runner.os }}-thirdparty-v0.1
           restore-keys: |
             ${{ runner.os }}-thirdparty-
 
       - name: Download Build Artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v3
         with:
-          name: build-${{ matrix.xlen }}-vm
-          path: build${{ matrix.xlen }}-vm
+          name: build-${{ matrix.xlen }}
+          path: build${{ matrix.xlen }}
 
       - name: Run tests
         run: |
-          cd build${{ matrix.xlen }}-vm
+          cd build${{ matrix.xlen }}
           source ci/toolchain_env.sh
           chmod -R +x . # Ensure all files have executable permissions
-          ./ci/regression.sh --vm
+          if [ "${{ matrix.name }}" == "regression" ]; then
+            ./ci/regression.sh --unittest
+            ./ci/regression.sh --isa
+            ./ci/regression.sh --kernel
+            ./ci/regression.sh --regression
+          else
+            ./ci/regression.sh --${{ matrix.name }}
+          fi
 
   complete:
     runs-on: ubuntu-20.04
-    needs: test_vm
+    needs: tests
 
     steps:
       - name: Check Completion

diff --git a/.gitmodules b/.gitmodules
@@ -1,9 +1,9 @@
-[submodule "third_party/fpnew"]
-	path = third_party/fpnew
-	url = https://github.com/pulp-platform/fpnew.git
 [submodule "third_party/softfloat"]
 	path = third_party/softfloat
 	url = https://github.com/ucb-bar/berkeley-softfloat-3.git
 [submodule "third_party/ramulator"]
 	path = third_party/ramulator
 	url = https://github.com/CMU-SAFARI/ramulator2.git
+[submodule "third_party/cvfpu"]
+	path = third_party/cvfpu
+	url = https://github.com/openhwgroup/cvfpu.git
diff --git a/Makefile.in b/Makefile.in
@@ -2,14 +2,6 @@ include config.mk
 
 .PHONY: build software tests
 
-vm:
-	$(MAKE) -C $(VORTEX_HOME)/third_party
-	$(MAKE) -C hw
-	$(MAKE) -C sim simx
-	$(MAKE) -C kernel
-	$(MAKE) -C runtime vm
-	$(MAKE) -C tests
-
 all:
 	$(MAKE) -C $(VORTEX_HOME)/third_party
 	$(MAKE) -C hw

diff --git a/README.md b/README.md
@@ -8,6 +8,7 @@ Vortex news can be found on its [website](https://vortex.cc.gatech.edu/)
 ## Specifications
 
 - Support RISC-V RV32IMAF and RV64IMAFD
+
 - Microarchitecture:
     - configurable number of cores, warps, and threads.
     - configurable number of ALU, FPU, LSU, and SFU units per core.
@@ -36,32 +37,29 @@ Vortex news can be found on its [website](https://vortex.cc.gatech.edu/)
 If you are interested in a stable release of Vortex, you can download the latest release [here](https://github.com/vortexgpgpu/vortex/releases/latest). Otherwise, you can pull the most recent, but (potentially) unstable version as shown below. The following steps demonstrate how to build and run Vortex with the default driver: SimX. If you are interested in a different backend, look [here](docs/simulation.md).
 
 ### Supported OS Platforms
-- Ubuntu 18.04, 20.04
+- Ubuntu 18.04, 20.04, 22.04, 24.04
 - Centos 7
 ### Toolchain Dependencies
 The following dependencies will be fetched prebuilt by `toolchain_install.sh`.
 - [POCL](http://portablecl.org/)
 - [LLVM](https://llvm.org/)
 - [RISCV-GNU-TOOLCHAIN](https://github.com/riscv-collab/riscv-gnu-toolchain)
 - [Verilator](https://www.veripool.org/verilator)
-- [FpNew](https://github.com/pulp-platform/fpnew.git)
+- [cvfpu](https://github.com/openhwgroup/cvfpu.git)
 - [SoftFloat](https://github.com/ucb-bar/berkeley-softfloat-3.git)
 - [Ramulator](https://github.com/CMU-SAFARI/ramulator.git)
 - [Yosys](https://github.com/YosysHQ/yosys)
 - [Sv2v](https://github.com/zachjs/sv2v)
-### Install development tools
-```sh
-sudo apt-get install build-essential
-sudo apt-get install binutils
-sudo apt-get install python
-sudo apt-get install uuid-dev
-sudo apt-get install git
-```
 ### Install Vortex codebase
 ```sh
 	git clone --depth=1 --recursive https://github.com/vortexgpgpu/vortex.git
 	cd vortex
 ```
+### Install system dependencies
+```sh
+# ensure dependent libraries are present
+sudo ./ci/install_dependencies.sh
+```
 ### Configure your build folder
 ```sh
     mkdir build
@@ -96,19 +94,19 @@ make -s
 make -s
 make install
 ```
-- Building Vortex 64-bit simply requires using --xlen=64 configure option.
+- Building Vortex 64-bit requires setting --xlen=64 configure option.
 ```sh
-../configure --xlen=32 --tooldir=$HOME/tools
+../configure --xlen=64 --tooldir=$HOME/tools
 ```
 - Sourcing "./ci/toolchain_env.sh" is required everytime you start a new terminal. we recommend adding "source <build-path>/ci/toolchain_env.sh" to your ~/.bashrc file to automate the process at login.
 ```sh
 echo "source <build-path>/ci/toolchain_env.sh" >> ~/.bashrc
 ```
-- Making changes to Makefiles in your source tree or adding new folders will require executing the "configure" script again to get it propagated into your build folder.
+- Making changes to Makefiles in your source tree or adding new folders will require executing the "configure" script again without any options to get changes propagated to your build folder.
 ```sh
 ../configure
 ```
-- To debug the GPU, you can generate a "run.log" trace. see /docs/debugging.md for more information.
+- To debug the GPU, the simulation can generate a runtime trace for analysis. See /docs/debugging.md for more information.
 ```sh
 ./ci/blackbox.sh --app=demo --debug=3
 ```