update the whole repo

Author: yhqiu16

LICENSE

@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2022, xxx
+Copyright (c) 2022, Fudan University
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

README.md

@@ -17,104 +17,158 @@ Framework for a hybrid system with RISC-V and CGRA, including:
 
 ### Dependencies
 
-##### Chipyard
 
-##### LLVM-10.0.0 with Polly included
+#### Chipyard 1.5.0
 
+1. install dependence tools
+
+```sh
+    sudo apt-get install -y build-essential bison flex software-properties-common curl
+    sudo apt-get install -y libgmp-dev libmpfr-dev libmpc-dev zlib1g-dev vim default-jdk default-jre
+    sudo apt-get install -y texinfo gengetopt
+    sudo apt-get install -y libexpat1-dev libusb-dev libncurses5-dev cmake
+    sudo apt-get install -y python3.8 patch diffstat texi2html texinfo subversion chrpath wget
+    sudo apt-get install -y libgtk-3-dev gettext
+    sudo apt-get install -y python3-pip python3.8-dev rsync libguestfs-tools expat ctags
+    sudo apt-get install -y device-tree-compiler
+```
+
+2. clone repo and build
+
+```sh
+    git clone https://github.com/ucb-bar/chipyard.git
+    cd chipyard
+    git checkout 1.5.0
+    ./scripts/init-submodules-no-riscv-tools.sh
+    ./scripts/build-toolchains.sh esp-tools --ignore-qemu
+```  
+
+
+#### LLVM-10.0.0 with Polly included
+
+
+1. download llvm source codes from https://github.com/llvm/llvm-project/archive/refs/tags/llvmorg-10.0.0.tar.gz
+    
+   extract and change directory name
+
+```sh
+    tar xvf llvmorg-10.0.0.tar.gz
+    mv llvmorg-10.0.0 llvm-project-10.0.0
+```
+
+2. build llvm
+
+```sh
+    mkdir llvm-10.0.0-built
+    cd llvm-project-10.0.0
+    mkdir build
+    cd build
+    cmake -DLLVM_ENABLE_PROJECTS='polly;clang' -G "Unix Makefiles" ../llvm
+    # multi-thread consumes lots of memory, e.g. -j4 : 30G+
+    make -j4
+    # DESTDIR set install directory
+    make install DESTDIR=/xxx/llvm/llvm-10.0.0-built
+```
+
+3. set llvm env
+
+```sh
+    # add following env to .bashrc and then source ~/.bashrc.
+    # or directly export the env
+    export LLVM_HOME=/xxx/llvm/llvm-10.0.0-built/usr/local/bin
+    export PATH=$LLVM_HOME:$PATH
+    # or set the LLVM path in the CMakeLists.txt
+    set(LLVM_INCLUDE_DIRS "/xxx/llvm-10.0.0-built/usr/local/include")
+    set(LLVM_LIBRARY_DIRS "/xxx/llvm-10.0.0-built/usr/local/lib")
+```
 
 
 ### CGRA-MG
 
+
 #### Setup
 
+
 1. copy this repo to the chipyard/generators/ directory
 
 2. Add the following configuration in the chipyard/build.sbt file
 
 ```
-lazy val chipyard = (project in file("generators/chipyard"))
-  .dependsOn(
-    ...
-    fdra
-)
-
-lazy val fdra = (project in file("generators/fdra/cgra-mg"))
-  .dependsOn(testchipip, rocketchip)
-  .settings(libraryDependencies ++= rocketLibDeps.value)
-  .settings(chiselTestSettings)
-  .settings(commonSettings)
-
+    lazy val chipyard = (project in file("generators/chipyard"))
+      .dependsOn(
+        ...
+        fdra
+    )
+
+    lazy val fdra = (project in file("generators/fdra/cgra-mg"))
+      .dependsOn(testchipip, rocketchip)
+      .settings(libraryDependencies ++= rocketLibDeps.value)
+      .settings(chiselTestSettings)
+      .settings(commonSettings)
 ```
 
 3. copy config file to chipyard
 
 ```sh
-cd chipyard/generators/fdra
-./scripts/setup-paths.sh
+    cd chipyard/generators/fdra
+    ./scripts/setup-paths.sh
 ```
 
 #### Build and run
 
 1. build verilog
 
 ```sh
-source env.sh
-cd generators/fdra
-./scripts/build-verilog.sh
+    source env.sh
+    cd generators/fdra
+    ./scripts/build-verilog.sh
 ```
 
 2. build simulator based on Verilator
 
 ```sh
-./scripts/build-verilator.sh
+    ./scripts/build-verilator.sh
 ```
 
 ### App-Compiler
 
 #### Setup
-
-Download LLVM-10.0.0 and build
-
-Set LLVM env
+    Download LLVM-10.0.0 and build
+    Set LLVM env
 
 #### Build and Run
-
-Using the script build.sh in this app-compiler directory. The internal path should be changed.
+    Using the script build.sh in this app-compiler directory. The internal path should be changed.
 
 ```sh
-./build.sh
+    ./build.sh
 ```
 
 
 ### CGRA-Compiler
 
 #### Build
-
-Using the script build.sh
+    Using the script build.sh
 ```sh
-cd cgra-compiler
-./build.sh
+    cd cgra-compiler
+    ./build.sh
 ```
 
 #### Run
-
-Using the script run.sh
+    Using the script run.sh
 ```sh
-./run.sh
+    ./run.sh
 ```
 
-Change the benchmark file path as you need.
-The generated result files are in the same directory as the benchmark.
+    Change the benchmark file path as you need.
+    The generated result files are in the same directory as the benchmark.
 
 
 
 ### Build & Run Application on SoC
 
 #### SoC application code generation
-
-Automatically generate with CGRA Compiler, or
-
-Manually replace the target loop kernel with CGRA call function and binding codes generated by CGRA Mapper
+    Automatically generate with CGRA Compiler, or   
+    Manually replace the target loop kernel with CGRA call function and binding codes generated by CGRA Mapper
 
 
 #### Compile SoC application code with RISC-V toolchain
@@ -129,6 +183,6 @@ Manually replace the target loop kernel with CGRA call function and binding code
 #### Run SoC application with simulator
 
 ```sh
-cd generators/fdra
-./scripts/run-verilator.sh app-name
+    cd generators/fdra
+    ./scripts/run-verilator.sh app-name
 ```

app-compiler/CMakeLists.txt

@@ -5,8 +5,8 @@ project(${PROJECT_NAME} VERSION 0.1.0)
 set(CMAKE_CXX_STANDARD 14)
 # set(CMAKE_BUILD_TYPE "Release")
 
-set(LLVM_INCLUDE_DIRS "/home/xxx/llvm-10.0.0-built/usr/local/include")
-set(LLVM_LIBRARY_DIRS "/home/xxx/llvm-10.0.0-built/usr/local/lib")
+set(LLVM_INCLUDE_DIRS "/xxx/llvm/llvm-10.0.0-built/usr/local/include")
+set(LLVM_LIBRARY_DIRS "/xxx/llvm/llvm-10.0.0-built/usr/local/lib")
 #find_package(LLVM 10 REQUIRED)
 # add_definitions(${LLVM_DEFINITIONS})
 include_directories(${LLVM_INCLUDE_DIRS})

app-compiler/build.sh

@@ -1,5 +1,5 @@
 # set env for built LLVM
-export LLVM_HOME=/xxx/llvm-10.0.0-built/usr/local/bin
+export LLVM_HOME=/xxx/llvm/llvm-10.0.0-built/usr/local/bin
 export PATH=$LLVM_HOME:$PATH
 
 # cmake & make

app-compiler/llvm-pass/CGRA_test.cpp

@@ -1,7 +1,7 @@
 #ifndef __LLVM_CDFG_H__
 #define __LLVM_CDFG_H__
 
-#define BITWIDTH 8
+#define BITWIDTH 16
 
 
 #include "llvm/Analysis/ScalarEvolution.h"

app-compiler/llvm-pass/include/llvm_cdfg.h

@@ -1,7 +1,7 @@
 
-all: conv2d_3x3 fft fir_unroll4 gemm-ncubed_unroll4 md-knn pedometer stencil2d
+all: conv2d_3x3 fft fir gemm md-knn pedometer stencil2d
 
-clean-all: clean-testaffine clean-conv2d_3x3 clean-fft clean-fir_unroll4 clean-gemm-ncubed_unroll4 clean-md-knn clean-pedometer clean-stencil2d
+clean-all: clean-testaffine clean-conv2d_3x3 clean-fft clean-fir clean-gemm clean-md-knn clean-pedometer clean-stencil2d
 
 
 # application: conv2d_3x3
@@ -28,29 +28,29 @@ fft:
 clean-fft:
 	cd ./fft; rm -f ./*.ll ./*.dot
 
-# application: fir_unroll4
-.PHONY : fir_unroll4
-fir_unroll4:
-	@echo "============================ fir_unroll4 =================================="
-	cd ./fir_unroll4; bash ../compile.sh kernel kernel
-	@echo "============================ fir_unroll4 =================================="
+# application: fir
+.PHONY : fir
+fir:
+	@echo "============================ fir =================================="
+	cd ./fir; bash ../compile.sh kernel kernel
+	@echo "============================ fir =================================="
 	@echo
 	@echo
 
-clean-fir_unroll4:
-	cd ./fir_unroll4; rm -f ./*.ll ./*.dot
+clean-fir:
+	cd ./fir; rm -f ./*.ll ./*.dot
 
-# application: gemm-ncubed_unroll4
-.PHONY : gemm-ncubed_unroll4
-gemm-ncubed_unroll4:
-	@echo "============================ gemm-ncubed_unroll4 =================================="
-	cd ./gemm-ncubed_unroll4; bash ../compile.sh gemm gemm
-	@echo "============================ gemm-ncubed_unroll4 =================================="
+# application: gemm
+.PHONY : gemm
+gemm:
+	@echo "============================ gemm =================================="
+	cd ./gemm; bash ../compile.sh gemm gemm
+	@echo "============================ gemm =================================="
 	@echo
 	@echo
 
-clean-gemm-ncubed_unroll4:
-	cd ./gemm-ncubed_unroll4; rm -f ./*.ll ./*.dot
+clean-gemm:
+	cd ./gemm; rm -f ./*.ll ./*.dot
 
 # application: md-knn
 .PHONY : md-knn
@@ -68,7 +68,7 @@ clean-md-knn:
 .PHONY : pedometer
 pedometer:
 	@echo "============================ pedometer =================================="
-	cd ./pedometer; bash ../compile.sh adapt_pedometer_step_is_array pedometer
+	cd ./pedometer; bash ../compile.sh pedometer pedometer
 	@echo "============================ pedometer =================================="
 	@echo
 	@echo

benchmarks/test4/Makefile

@@ -1,5 +1,12 @@
 ### Run to generate CDFGs for benchmarks
 
+#### 1. Setup path
+
+change paths of the LLVM library and the generated Pass library in compile.sh
+
+
+#### 2. Generate DFGs
+
 Using the Makefile in the fdra/benchmarks/test4 directory
 
 The generated CDFG files are in the same dirrectory as the benchmark.

benchmarks/test4/README.md

@@ -1,12 +1,12 @@
 # ./compile.sh c-file-name function-name
 
-# -fno-inline -fno-unroll-loops
-export LLVM_HOME=/home/tallanlong/llvm-10.0.0-built/usr/local/bin
+export LLVM_HOME=/xxx/llvm/llvm-10.0.0-built/usr/local/bin
 export PATH=$LLVM_HOME:$PATH
 
-clang -I /home/tallanlong/app-compiler-decouple/app-compiler-pattern/applications/MachSuite/common  -D CGRA_COMPILER -target i386-unknown-linux-gnu -c -emit-llvm -O2 -fno-tree-vectorize -fno-unroll-loops $1.c -S -o $1.ll
+clang -D CGRA_COMPILER -target i386-unknown-linux-gnu -c -emit-llvm -O1 -fno-tree-vectorize -fno-unroll-loops $1.c -S -o $1.ll
 
 opt -gvn -mem2reg -memdep -memcpyopt -lcssa -loop-simplify -licm -loop-deletion -indvars -simplifycfg -mergereturn -indvars $1.ll -S -o $1_gvn.ll
 
-opt -load ../../../app-compiler/build/llvm-pass/libCDFGPass.so -fn $2 -cdfg $1_gvn.ll -S -o $1_cdfg.ll
+opt -load /xxx/fdra/app-compiler/build/llvm-pass/libCDFGPass.so -fn $2 -cdfg $1_gvn.ll -S -o $1_cdfg.ll
 
+dot -Tdot_json affine.dot -o affine.json