Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update boost deps for core and mss, track Sparta PR397 #42

Merged
merged 36 commits into from
May 8, 2023
Merged

Update boost deps for core and mss, track Sparta PR397 #42

Show file tree
Hide file tree
Changes from 28 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
2cd2608
tell cmake to include boost libs
Feb 3, 2023
6299f22
fixed boost include for tests
Feb 3, 2023
4795d0b
using the FindSparta.cmake which sparta installs to find libs and inc…
Feb 10, 2023
828d884
Merge branch 'riscv-software-src:master' into boost_fix
peter-d Feb 22, 2023
88d0200
tracking sparta PR #408, weightedcontextcounter is now in sparta/stat…
Feb 20, 2023
86d45bf
CI should pick up sparta in default location after make install for s…
Feb 23, 2023
eb4182c
install sparta in github workspace area where we have permissions to …
Feb 24, 2023
7fdb723
no need to mark project as C, hdf5 find is fixed
peter-d Mar 4, 2023
8ce74e9
Resolved merge conflict with master
Mar 16, 2023
5722d2a
bump cmake to more recent version, so it can find hdf5
peter-d Mar 27, 2023
783865b
somewhat less aggressive: 3.19 might be ok?
peter-d Mar 27, 2023
24bc16d
need existing version
peter-d Mar 27, 2023
1194158
nuclear option: no version pins at all
peter-d Mar 27, 2023
e615d9e
branch needs sparta master
peter-d Mar 27, 2023
57aadb2
double check on sparta git version we use in CI
peter-d Mar 28, 2023
f23e0ec
hacky workaround to get the right sparta branch in CI
peter-d Mar 28, 2023
6fd31f2
hacky workaround to get the right sparta branch in CI, v2
peter-d Mar 28, 2023
60dcb1f
hacky workaround to get the right sparta branch in CI, v3
peter-d Mar 28, 2023
d933500
hacky workaround to get the right sparta branch in CI, v4
peter-d Mar 28, 2023
0667094
Merge branch 'master' into boost_fix
peter-d Mar 28, 2023
aa8d97e
latest submodules just like master
peter-d Mar 28, 2023
85f9c55
verbose build for CI debug
peter-d Mar 28, 2023
7f1a9df
added sparta dep to core common test
peter-d Mar 28, 2023
e5db40a
no need for verbose
peter-d Mar 28, 2023
a065a9b
trying to debug stf linking issue in CI
peter-d Mar 28, 2023
e8b939e
Trying a conda install of sparta
Mar 28, 2023
fdc60b3
Setup linker support for LTO
Mar 28, 2023
a7cf25d
add in link libraries where they were missing
peter-d Mar 29, 2023
53cac69
I think these changes will work in Peter's environment
Apr 14, 2023
f3d7ecc
Added cool banner
Apr 14, 2023
f1c16b3
get all required includes for sparta from the property
peter-d Apr 28, 2023
1123995
resolve conflict with master
peter-d Apr 28, 2023
80e2b30
Merge branch 'master' into boost_fix
peter-d Apr 28, 2023
589c16d
should not have removed install
peter-d Apr 28, 2023
faed611
Use the branch map_v2 for regressions
klingaard May 7, 2023
5ce1b6a
Update README.md
May 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions .github/actions/build/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ echo "Starting Build Entry"
echo "HOME:" $HOME
echo "GITHUB_WORKSPACE:" $GITHUB_WORKSPACE
echo "GITHUB_EVENT_PATH:" $GITHUB_EVENT_PATH
echo "CONDA_PREFIX:" $CONDA_PREFIX
echo "PWD:" `pwd`

#
Expand All @@ -17,16 +18,14 @@ echo "PWD:" `pwd`
#
echo "Building Sparta Infra"
cd ${GITHUB_WORKSPACE}/map/sparta
mkdir -p release # Link step expects "release" as dir name
ln -s release fastdebug
ln -s release debug
mkdir -p release
cd release
cmake .. -DCMAKE_BUILD_TYPE=$OLYMPIA_BUILD_TYPE -DGEN_DEBUG_INFO=OFF
cmake .. -DCMAKE_BUILD_TYPE=$OLYMPIA_BUILD_TYPE -DGEN_DEBUG_INFO=OFF -DCMAKE_INSTALL_PREFIX=${CONDA_PREFIX}
if [ $? -ne 0 ]; then
echo "ERROR: Cmake for Sparta framework failed"
exit 1
fi
make -j2
make -j2 install
BUILD_SPARTA=$?
if [ ${BUILD_SPARTA} -ne 0 ]; then
echo "ERROR: build sparta FAILED!!!"
Expand All @@ -36,12 +35,12 @@ fi
cd ${GITHUB_WORKSPACE}
mkdir $OLYMPIA_BUILD_TYPE
cd $OLYMPIA_BUILD_TYPE
cmake .. -DCMAKE_BUILD_TYPE=$OLYMPIA_BUILD_TYPE -DGEN_DEBUG_INFO=OFF -DSPARTA_BASE=${GITHUB_WORKSPACE}/map/sparta
cmake .. -DCMAKE_BUILD_TYPE=$OLYMPIA_BUILD_TYPE -DGEN_DEBUG_INFO=OFF
if [ $? -ne 0 ]; then
echo "ERROR: Cmake for olympia failed"
exit 1
fi
make -j2 regress
make -j2 regress VERBOSE=1
BUILD_OLYMPIA=$?
if [ ${BUILD_OLYMPIA} -ne 0 ]; then
echo "ERROR: build/regress of olympia FAILED!!!"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ubuntu-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
with:
repository: sparcians/map
path: map
ref: map_v1.1.1
ref: master

# Setup Conda and build environment
- name: Grab Python v3.8
Expand Down
47 changes: 31 additions & 16 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.17)
cmake_minimum_required(VERSION 3.19)
set (CMAKE_CXX_STANDARD 17)
set (CMAKE_CXX_STANDARD_REQUIRED ON)

Expand All @@ -11,16 +11,37 @@ add_compile_options ( -Werror

################################################################################
# Set up Sparta
if (NOT SPARTA_BASE)
message (FATAL_ERROR "Need to define the location of the Sparta: cmake <args> -DSPARTA_BASE=\"/path/to/sparta\"")
endif ()
include (${SPARTA_BASE}/cmake/sparta-config.cmake)
if(IS_DIRECTORY ${SPARTA_SEARCH_DIR})
message (STATUS "Using '${SPARTA_SEARCH_DIR}' for sparta install")
elseif(DEFINED ENV{CONDA_PREFIX})
message (STATUS "Looking for SPARTA in the conda environment: '$ENV{CONDA_PREFIX}'")
set(SPARTA_SEARCH_DIR $ENV{CONDA_PREFIX})
else()
message (STATUS "If needed, please provide the location where sparta is installed: -DSPARTA_SEARCH_DIR=<directory>")
endif()
set(CMAKE_MODULE_PATH "${SPARTA_SEARCH_DIR}/lib/cmake/sparta" ${CMAKE_MODULE_PATH})

find_package(Sparta REQUIRED)

if (NOT SPARTA_FOUND)
message (FATAL_ERROR "Sparta was not found in ${SPARTA_SEARCH_DIR}")
else()
message (STATUS "Sparta was found in ${SPARTA_SEARCH_DIR}")
endif()
#include_directories(${SPARTA_INCLUDE_DIRS})
Copy link

@ghost ghost Mar 29, 2023 •
edited by ghost
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm wondering if uncommenting this line will fix your include issues. Can you do that AND remove the target_link lines to see if you still have problems?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It helps to some extent: No more errors on Sparta includes, but it lacks the secondary includes it seems, as now I am getting boost errors: (which on my system is also not in a default system path, because I am pointing to a specific version somewhere in /opt/homebrew)

(which ironically is back to square one - not finding boost was my initial problem to tackle all makefiles ;-) )

In file included from /Users/pdback/src/peter-d/riscv-perf-model/core/Decode.cpp:6:
In file included from /Users/pdback/src/peter-d/riscv-perf-model/core/Decode.hpp:8:
In file included from /Users/pdback/opt/sparta/include/sparta/ports/DataPort.hpp:15:
In file included from /Users/pdback/opt/sparta/include/sparta/ports/Port.hpp:19:
In file included from /Users/pdback/opt/sparta/include/sparta/events/Event.hpp:15:
In file included from /Users/pdback/opt/sparta/include/sparta/events/EventNode.hpp:16:
In file included from /Users/pdback/opt/sparta/include/sparta/simulation/Clock.hpp:21:
/Users/pdback/opt/sparta/include/sparta/kernel/Scheduler.hpp:13:10: fatal error: 'boost/timer/timer.hpp' file not found
#include <boost/timer/timer.hpp>
         ^~~~~~~~~~~~~~~~~~~~~~~

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's what this line and the next in FindSparta.cmake are providing automatically when you add sparta as a link library:

https://github.com/sparcians/map/blob/6f0636f7a717238cd039be33f7975048449bb82c/sparta/cmake/FindSparta.cmake#L69

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I can reproduce the missing include problem, but the not boost one. I'll admit that I don't fully grok how cmake brings in the goods from a package. You'd think the find_package method would be enough! But sparta must be installed in a "standard" location or something so that includes AND library paths are set up? I don't get it...

Copy link
Collaborator Author

@peter-d peter-d Apr 1, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All find_package does is import a target for the library (as if it were defined elsewhere in the makefiles with add_library) but it won’t set up any default compile or link flags project wide, it will only add the relevant options to the targets when you explicitly say they depend on the imported target. In this case that means unless you explicitly add SPARTA::sparta it won’t pass the flags. Which you won’t notice if everything is installed in system wide include and lib paths, but it will break as soon as one of the components (either Sparta or the lobs it depends on) is not in that default path.

That said, there could be a way to only add the include paths and maybe not the link flags, but I expect that to fail at linking still…

Reason I see boost problems is because I have multiple boost versions via homebrew, and Sparta needs one that is not the default one. (There’s macOS issues with boost 1.81 command line arguments)

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you Peter and Knute for working through this.

Trying to understand the latest status of this work: From the comments above, I understand at least the regression is not working yet. But is it just the regression or more than that? Would I be able to build riscv-perf-model / olympia with latest head of master of Sparta (which installs Sparta in the conda environment)?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually regression is working with these changes, but only because the CI is strictly controlled:

  1. Create a conda environment
  2. Build and regress everything inside that conda environment

For those folks that do not use conda or prefer not to, it's hard to set up a CMakeList flow that works for both.

Copy link
Collaborator Author

@peter-d peter-d Apr 5, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As long as Sparta (and it’s dependencies like boost hdf5 etc) are available in the default paths (libs and includes) it just works. It’s just in case some dependencies are not in a default location, that the overridden paths are not passed through from Sparta to Olympia… (eg I have a home brew boost version in macOS that is not the default one which gives me troubles when I want to this locally branch)


################################################################################
# Set up STF library
set (STF_LIB_BASE ${PROJECT_SOURCE_DIR}/stf_lib)
set (DISABLE_STF_DOXYGEN ON)
#include(${STF_LIB_BASE}/cmake/stf-config.cmake)

if (CMAKE_BUILD_TYPE MATCHES "^[Rr]elease")
set (FULL_LTO true)
include(${STF_LIB_BASE}/cmake/stf_linker_setup.cmake)
setup_stf_linker(false)
endif()



# Use ccache if installed
find_program (CCACHE_PROGRAM ccache)
Expand All @@ -45,12 +66,6 @@ else()
message (FATAL_ERROR "Please provide a CMAKE_BUILD_TYPE: -DCMAKE_BUILD_TYPE=Release|Debug|Profile")
endif()

# Sparta/STF linking
link_directories (
${SPARTA_BASE}/${SPARTA_BUILD_TYPE}
${SPARTA_BASE}/${SPARTA_BUILD_TYPE}/simdb
)

# Profile build flags
set(CMAKE_CXX_FLAGS_PROFILE "-O3 -pg -g -ftime-trace")
set(CMAKE_CXX_FLAGS_FASTDEBUG "-O3 -g")
Expand All @@ -59,8 +74,6 @@ set(CMAKE_CXX_FLAGS_FASTDEBUG "-O3 -g")
include_directories (core mss)
include_directories (SYSTEM mavis)
include_directories (SYSTEM stf_lib)
include_directories (SYSTEM ${SPARTA_BASE})
include_directories (SYSTEM ${SPARTA_BASE}/simdb/include)

# The Core, MSS, and the simulator
add_subdirectory(core)
Expand All @@ -77,10 +90,12 @@ add_executable(olympia
sim/OlympiaSim.cpp
sim/main.cpp
)
target_link_libraries (olympia core mss ${Sparta_LIBS} ${STF_LINK_LIBS})
target_link_libraries (olympia core mss SPARTA::sparta ${STF_LINK_LIBS})
if (CMAKE_BUILD_TYPE MATCHES "^[Rr]elease")
target_link_options (olympia PUBLIC -flto)
target_compile_options (core PUBLIC -flto)
target_compile_options (mss PUBLIC -flto)
target_compile_options (olympia PUBLIC -flto)
target_link_options (olympia PUBLIC -flto)
endif()

# Create a few links like reports and arch directories
Expand Down
138 changes: 69 additions & 69 deletions conda/environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,72 +2,72 @@ name: riscv_perf_model
channels:
- conda-forge
dependencies:
- _libgcc_mutex=0.1=conda_forge
- _openmp_mutex=4.5=2_gnu
- binutils_impl_linux-64=2.39=he00db2b_1
- binutils_linux-64=2.39=h5fc0e48_11
- boost=1.76.0=py310h7c3ba0c_1
- boost-cpp=1.76.0=h312852a_1
- bzip2=1.0.8=h7f98852_4
- c-ares=1.18.1=h7f98852_0
- ca-certificates=2022.12.7=ha878542_0
- cmake=3.17.0=h28c56e5_0
- cppcheck=2.7.5=py310h94ea96f_1
- curl=7.87.0=h6312ad2_0
- doxygen=1.8.20=had0d8f1_0
- expat=2.5.0=h27087fc_0
- gcc_impl_linux-64=10.4.0=h5231bdf_19
- gcc_linux-64=10.4.0=h9215b83_11
- gxx_impl_linux-64=10.4.0=h5231bdf_19
- gxx_linux-64=10.4.0=h6e491c6_11
- hdf5=1.10.6=nompi_h6a2412b_1114
- icu=68.2=h9c3ff4c_0
- kernel-headers_linux-64=2.6.32=he073ed8_15
- keyutils=1.6.1=h166bdaf_0
- krb5=1.20.1=hf9c8cef_0
- ld_impl_linux-64=2.39=hcc3a1bd_1
- libblas=3.9.0=16_linux64_openblas
- libcblas=3.9.0=16_linux64_openblas
- libcurl=7.87.0=h6312ad2_0
- libedit=3.1.20191231=he28a2e2_2
- libev=4.33=h516909a_1
- libffi=3.4.2=h7f98852_5
- libgcc-devel_linux-64=10.4.0=hd38fd1e_19
- libgcc-ng=12.2.0=h65d4601_19
- libgfortran-ng=12.2.0=h69a702a_19
- libgfortran5=12.2.0=h337968e_19
- libgomp=12.2.0=h65d4601_19
- libiconv=1.17=h166bdaf_0
- liblapack=3.9.0=16_linux64_openblas
- libnghttp2=1.51.0=hdcd2b5c_0
- libnsl=2.0.0=h7f98852_0
- libopenblas=0.3.21=pthreads_h78a6416_3
- libsanitizer=10.4.0=h5246dfb_19
- libsqlite=3.40.0=h753d276_0
- libssh2=1.10.0=haa6b8db_3
- libstdcxx-devel_linux-64=10.4.0=hd38fd1e_19
- libstdcxx-ng=12.2.0=h46fd767_19
- libuuid=2.32.1=h7f98852_1000
- libuv=1.44.2=h166bdaf_0
- libzlib=1.2.13=h166bdaf_4
- ncurses=6.3=h27087fc_1
- numpy=1.24.1=py310h08bbf29_0
- openssl=1.1.1s=h0b41bf4_1
- pcre=8.45=h9c3ff4c_0
- pip=22.3.1=pyhd8ed1ab_0
- pygments=2.11.2=pyhd8ed1ab_0
- python=3.10.8=h257c98d_0_cpython
- python_abi=3.10=3_cp310
- rapidjson=1.1.0=he1b5a44_1002
- readline=8.1.2=h0f457ee_0
- rhash=1.4.3=h166bdaf_0
- setuptools=65.6.3=pyhd8ed1ab_0
- sqlite=3.36.0=h9cd32fc_2
- sysroot_linux-64=2.12=he073ed8_15
- tk=8.6.12=h27826a3_0
- tzdata=2022g=h191b570_0
- wheel=0.38.4=pyhd8ed1ab_0
- xz=5.2.6=h166bdaf_0
- yaml-cpp=0.7.0=h27087fc_2
- zlib=1.2.13=h166bdaf_4
- zstd=1.5.2=h6239696_4
- _libgcc_mutex>=0.1=conda_forge
- _openmp_mutex>=4.5=2_gnu
- binutils_impl_linux-64>=2.39=he00db2b_1
- binutils_linux-64>=2.39=h5fc0e48_11
- boost>=1.76.0=py310h7c3ba0c_1
- boost-cpp>=1.76.0=h312852a_1
- bzip2>=1.0.8=h7f98852_4
- c-ares>=1.18.1=h7f98852_0
- ca-certificates>=2022.12.7=ha878542_0
- cmake>=3.19.7
- cppcheck>=2.7.5=py310h94ea96f_1
- curl>=7.87.0=h6312ad2_0
- doxygen>=1.8.20=had0d8f1_0
- expat>=2.5.0=h27087fc_0
- gcc_impl_linux-64>=10.4.0=h5231bdf_19
- gcc_linux-64>=10.4.0=h9215b83_11
- gxx_impl_linux-64>=10.4.0=h5231bdf_19
- gxx_linux-64>=10.4.0=h6e491c6_11
- hdf5>=1.10.6=nompi_h6a2412b_1114
- icu>=68.2=h9c3ff4c_0
- kernel-headers_linux-64>=2.6.32=he073ed8_15
- keyutils>=1.6.1=h166bdaf_0
- krb5>=1.20.1=hf9c8cef_0
- ld_impl_linux-64>=2.39=hcc3a1bd_1
- libblas>=3.9.0=16_linux64_openblas
- libcblas>=3.9.0=16_linux64_openblas
- libcurl>=7.87.0=h6312ad2_0
- libedit>=3.1.20191231=he28a2e2_2
- libev>=4.33=h516909a_1
- libffi>=3.4.2=h7f98852_5
- libgcc-devel_linux-64>=10.4.0=hd38fd1e_19
- libgcc-ng>=12.2.0=h65d4601_19
- libgfortran-ng>=12.2.0=h69a702a_19
- libgfortran5>=12.2.0=h337968e_19
- libgomp>=12.2.0=h65d4601_19
- libiconv>=1.17=h166bdaf_0
- liblapack>=3.9.0=16_linux64_openblas
- libnghttp2>=1.51.0=hdcd2b5c_0
- libnsl>=2.0.0=h7f98852_0
- libopenblas>=0.3.21=pthreads_h78a6416_3
- libsanitizer>=10.4.0=h5246dfb_19
- libsqlite>=3.40.0=h753d276_0
- libssh2>=1.10.0=haa6b8db_3
- libstdcxx-devel_linux-64>=10.4.0=hd38fd1e_19
- libstdcxx-ng>=12.2.0=h46fd767_19
- libuuid>=2.32.1=h7f98852_1000
- libuv>=1.44.2=h166bdaf_0
- libzlib>=1.2.13=h166bdaf_4
- ncurses>=6.3=h27087fc_1
- numpy>=1.24.1=py310h08bbf29_0
- openssl>=1.1.1s=h0b41bf4_1
- pcre>=8.45=h9c3ff4c_0
- pip>=22.3.1=pyhd8ed1ab_0
- pygments>=2.11.2=pyhd8ed1ab_0
- python>=3.10.8=h257c98d_0_cpython
- python_abi>=3.10=3_cp310
- rapidjson>=1.1.0=he1b5a44_1002
- readline>=8.1.2=h0f457ee_0
- rhash>=1.4.3=h166bdaf_0
- setuptools>=65.6.3=pyhd8ed1ab_0
- sqlite>=3.36.0=h9cd32fc_2
- sysroot_linux-64>=2.12=he073ed8_15
- tk>=8.6.12=h27826a3_0
- tzdata>=2022g=h191b570_0
- wheel>=0.38.4=pyhd8ed1ab_0
- xz>=5.2.6=h166bdaf_0
- yaml-cpp>=0.7.0=h27087fc_2
- zlib>=1.2.13=h166bdaf_4
- zstd>=1.5.2=h6239696_4
1 change: 1 addition & 0 deletions core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ add_library(core
CPUFactory.cpp
CPUTopology.cpp
)
target_link_libraries (core PUBLIC SPARTA::sparta ${STF_LINK_LIBS})
3 changes: 1 addition & 2 deletions core/Dispatch.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@
#include "sparta/log/MessageSource.hpp"
#include "sparta/statistics/Counter.hpp"
#include "sparta/statistics/ContextCounter.hpp"
#include "sparta/simulation/ResourceFactory.hpp"

#include "sparta/statistics/WeightedContextCounter.hpp"
#include "sparta/simulation/ResourceFactory.hpp"

#include "Dispatcher.hpp"
#include "CoreTypes.hpp"
Expand Down
2 changes: 1 addition & 1 deletion mavis
Open in desktop
Submodule mavis updated 18 files
+148 −0 json/isa_rv64h.json
+2,350 −0 json/isa_rv64v.json
+828 −0 json/isa_rv64vf.json
+68 −0 json/isa_rv64zba.json
+226 −0 json/isa_rv64zbb.json
+26 −0 json/isa_rv64zbc.json
+66 −0 json/isa_rv64zbs.json
+2 −2 mavis/DecodedInstInfo.h
+0 −2 mavis/Extractor.h
+100 −0 mavis/ExtractorDirectImplementations.hpp
+0 −2 mavis/ExtractorTraceInfo.h
+1 −1 mavis/IFactoryBuilder.h
+14 −5 mavis/InstMetaData.h
+214 −2 test/main.cpp
+4,052 −105 test/out
+367 −0 test/rv64.tset
+47 −0 test/rv64_bits.tset
+15 −0 test/rv64h.tset
2 changes: 2 additions & 0 deletions mss/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ add_library(mss
BIU.cpp
MSS.cpp
)
target_include_directories(mss SYSTEM PRIVATE ${Boost_INCLUDE_DIRS})
target_link_libraries(mss PUBLIC SPARTA::sparta)
2 changes: 1 addition & 1 deletion stf_lib
Open in desktop
Submodule stf_lib updated 1 files
+1 −2 cmake/stf-config.cmake
1 change: 1 addition & 0 deletions test/core/common/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ project(common_test)
add_library(common_test
SourceUnit.cpp
)
target_link_libraries(common_test PRIVATE core SPARTA::sparta)
5 changes: 2 additions & 3 deletions test/core/dispatch/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
project(Dispatch_test)

add_executable(Dispatch_test Dispatch_test.cpp)
target_link_libraries(Dispatch_test core common_test ${STF_LINK_LIBS} ${Sparta_LIBS})

include(${SPARTA_BASE}/test/TestingMacros.cmake)
target_link_libraries(Dispatch_test core common_test ${STF_LINK_LIBS} SPARTA::sparta)

file(CREATE_LINK ${SIM_BASE}/mavis/json ${CMAKE_CURRENT_BINARY_DIR}/mavis_isa_files SYMBOLIC)
file(CREATE_LINK ${SIM_BASE}/arches ${CMAKE_CURRENT_BINARY_DIR}/arches SYMBOLIC)
file(CREATE_LINK ${CMAKE_CURRENT_SOURCE_DIR}/test_cores ${CMAKE_CURRENT_BINARY_DIR}/test_cores SYMBOLIC)
file(CREATE_LINK ${CMAKE_CURRENT_SOURCE_DIR}/expected_output ${CMAKE_CURRENT_BINARY_DIR}/expected_output SYMBOLIC)

# Single add per cycle
# Note: these macros get defined when find_package(Sparta) is called
sparta_named_test(Dispatch_test_Run_Small Dispatch_test small_core.out -c test_cores/test_small_core.yaml)
sparta_named_test(Dispatch_test_Run_Medium Dispatch_test medium_core.out -c test_cores/test_medium_core.yaml)
sparta_named_test(Dispatch_test_Run_Big Dispatch_test big_core.out -c test_cores/test_big_core.yaml)
3 changes: 1 addition & 2 deletions test/sim/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
project(olympia_test)

# Include the handy testing marcros defined in Sparta
include(${SPARTA_BASE}/test/TestingMacros.cmake)
# Note: these sparta_* macros/functions get defined when find_package(Sparta) is called

# This line will make sure olympia is built before running the tests
sparta_regress (olympia)
Expand Down