riscv
/
OpenFPGA
mirror of https://github.com/lnis-uofu/OpenFPGA.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Updating script to fix CI issue

This commit is contained in:
Lalit Sharma 2021-03-29 00:39:53 -07:00
parent 11c9e59006
commit 5d857bd3cf
3 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build.yml vendored
View File

@ -134,11 +134,11 @@ jobs:
cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE
- name: Build - name: Build
working-directory: build #working-directory: build
shell: bash shell: bash
# Execute the build. You can specify a specific target with "--target <NAME>" # Execute the build. You can specify a specific target with "--target <NAME>"
run: | run: |
source ../openfpga.sh && cmake --build . --config $BUILD_TYPE source openfpga.sh && cmake --build build --config $BUILD_TYPE
# Check the cache size and see if it is over the limit # Check the cache size and see if it is over the limit
- name: Check ccache size - name: Check ccache size

23
CMakeLists.txt
View File

@ -231,33 +231,22 @@ include(CheckCXXCompilerFlag)
# run makefile provided, we pass-on the options to the local make file # run makefile provided, we pass-on the options to the local make file
add_custom_target( add_custom_target(
yosys ALL yosys ALL
COMMAND rm -rf ${CMAKE_CURRENT_SOURCE_DIR}/yosys/install COMMAND rm -rf ${CMAKE_CURRENT_SOURCE_DIR}/yosys/install
COMMAND $(MAKE) config-gcc COMMAND $(MAKE) config-gcc
COMMAND $(MAKE) install PREFIX=${CMAKE_CURRENT_SOURCE_DIR}/yosys/install COMMAND $(MAKE) install PREFIX=${CMAKE_CURRENT_SOURCE_DIR}/yosys/install
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/yosys WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/yosys
COMMENT "Compile Yosys with given Makefile: ${CMAKE_CURRENT_SOURCE_DIR}/yosys/install" COMMENT "Compile Yosys with given Makefile"
) )
# yosys compilation ends # yosys compilation ends
# yosys-plugins compilation starts # yosys-plugins compilation starts
add_custom_target(
YosysVariables ALL ${CMAKE_COMMAND}
-D YOSYS_INSTALL=${CMAKE_CURRENT_SOURCE_DIR}/yosys/install
-P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/YosysVars.cmake
COMMENT "Getting Yosys variables to use in yosys-plugins build: ${YS_CXX}"
)
add_dependencies(YosysVariables yosys)
# run makefile provided, we pass-on the options to the local make file
add_custom_target( add_custom_target(
yosys-plugins ALL yosys-plugins ALL
COMMAND $(MAKE) CXX=${YS_CXX} CXXFLAGS=${YS_CXXFLAGS} LDFLAGS=${YS_LDFLAGS} COMMAND $(MAKE)
LDLIBS=${YS_LDLIBS} PLUGINS_DIR=${YS_DATA_DIR}/plugins DATA_DIR=${YS_DATA_DIR} COMMAND $(MAKE) install
COMMAND $(MAKE) install CXX=${YS_CXX} CXXFLAGS=${YS_CXXFLAGS} LDFLAGS=${YS_LDFLAGS} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/yosys-plugins
LDLIBS=${YS_LDLIBS} PLUGINS_DIR=${YS_DATA_DIR}/plugins DATA_DIR=${YS_DATA_DIR} COMMENT "Compile Yosys-plugins with given Makefile"
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/yosys-plugins
COMMENT "Compile Yosys-plugins with given Makefile: ${YS_CXX}"
) )
#add_dependencies(yosys-plugins yosys ) #YosysVariables) #add_dependencies(yosys-plugins yosys ) #YosysVariables)

4
openfpga.sh
View File

@ -16,6 +16,10 @@ export OPENFPGA_SCRIPT_PATH="${OPENFPGA_PATH}/openfpga_flow/scripts"
export OPENFPGA_TASK_PATH="${OPENFPGA_PATH}/openfpga_flow/tasks" export OPENFPGA_TASK_PATH="${OPENFPGA_PATH}/openfpga_flow/tasks"
if [ -z $PYTHON_EXEC ]; then export PYTHON_EXEC="python3"; fi if [ -z $PYTHON_EXEC ]; then export PYTHON_EXEC="python3"; fi
# Add yosys bin folder in PATH, this is required by yosys-plugins
# to install plugins in yosys folder
export PATH="${OPENFPGA_PATH}/yosys/install/bin:${PATH}"
# This function checks the path and # This function checks the path and
# raises warning if the command is not executing # raises warning if the command is not executing
# inside current OpendFPGA folder # inside current OpendFPGA folder