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

Jump to bottom

Regress Olympia on MacOS #171

Merged
merged 23 commits into from
Jun 5, 2024
Merged

Regress Olympia on MacOS #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
bd54ada
Added macos-12 build to regression
kathlenemagnus May 31, 2024
4947329
Only build one MacOS target (Debug + clang)
kathlenemagnus May 31, 2024
ca9fe2d
Try different Conda env yml
kathlenemagnus May 31, 2024
3471ce1
Fixed Conda env yml path
kathlenemagnus May 31, 2024
da711eb
Add Conda env name
kathlenemagnus May 31, 2024
936dd41
Ubuntu and MacOs should be able to use the same Conda env yml
kathlenemagnus May 31, 2024
a12e6a8
Revert "Ubuntu and MacOs should be able to use the same Conda env yml"
kathlenemagnus May 31, 2024
4d128a6
Trying smaller set of requirements
kathlenemagnus May 31, 2024
a8125ef
Removed gcc linux (duh!)
kathlenemagnus May 31, 2024
34f7061
Added boost-cpp
kathlenemagnus May 31, 2024
081e65f
Attempt to fix Boost
kathlenemagnus May 31, 2024
5514ac4
Revert "Attempt to fix Boost"
kathlenemagnus May 31, 2024
7aa8eba
Attempt to fix Boost fail
kathlenemagnus May 31, 2024
70599fe
Another attempt to fix boost...
kathlenemagnus May 31, 2024
c17b688
Use Conda env var for path
kathlenemagnus May 31, 2024
88cf238
Updated macos Conda env yml
kathlenemagnus May 31, 2024
cd5ecd3
Removed useful fix
kathlenemagnus May 31, 2024
f2abfd6
Move to latest Mavis version
kathlenemagnus May 31, 2024
dc21d11
Trying with action conda-incubator
phattso Jun 5, 2024
88075cc
Convert tabs to spaces
phattso Jun 5, 2024
c6b0686
Always build Sparta with Release type
phattso Jun 5, 2024
ece20fd
Fix release -> Release
phattso Jun 5, 2024
e63e209
Update Mac Conda env yml
kathlenemagnus Jun 5, 2024
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
4 changes: 2 additions & 2 deletions .github/actions/build/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -x

source "/usr/share/miniconda/etc/profile.d/conda.sh"
source $CONDA/etc/profile.d/conda.sh
conda activate riscv_perf_model

echo "Starting Build Entry"
Expand All @@ -23,7 +23,7 @@ echo "Building Sparta Infra"
cd ${GITHUB_WORKSPACE}/map/sparta
mkdir -p release
cd release
CC=$COMPILER CXX=$CXX_COMPILER cmake .. -DCMAKE_BUILD_TYPE=$OLYMPIA_BUILD_TYPE -DGEN_DEBUG_INFO=OFF -DCMAKE_INSTALL_PREFIX=${CONDA_PREFIX}
CC=$COMPILER CXX=$CXX_COMPILER cmake .. -DCMAKE_BUILD_TYPE=Release -DGEN_DEBUG_INFO=OFF -DCMAKE_INSTALL_PREFIX=${CONDA_PREFIX}
if [ $? -ne 0 ]; then
echo "ERROR: Cmake for Sparta framework failed"
exit 1
Expand Down
182 changes: 182 additions & 0 deletions .github/workflows/conda/macos_env.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,182 @@
name: riscv_perf_model
kathlenemagnus marked this conversation as resolved.
Show resolved Hide resolved
channels:
- conda-forge
dependencies:
- atk-1.*
- backcall=0.2.*
- backports=1.*
- backports.functools_lru_cache=1.6.*
- binutils_impl_linux-64=2.*
- boost=1.78.*
- boost-cpp=1.78.*
- brotli=1.0.*
- brotli-bin=1.0.*
- brotlipy=0.7.*
- bzip2=1.0.*
- ca-certificates=2022.12.*
- cairo=1.16.*
- c-ares=1.18.*
- cctools_osx-64=973.0.*
- certifi=2022.12.*
- cffi=1.15.*
- charset-normalizer=2.1.*
- clang=14.0.*
- clang-14=14.0.*
- clang_osx-64=14.0.*
- clangxx=14.0.*
- clangxx_osx-64=14.0.*
- cmake=3.25.*
- compiler-rt=14.0.*
- compiler-rt_linux-64=14.0.*
- compiler-rt_osx-64=14.0.*
- contourpy=1.0.*
- cppcheck=2.7.*
- cryptography=39.0.*
- cycler=0.11.*
- cython=0.29.*
- decorator=5.1.*
- doxygen=1.9.*
- executing=1.2.*
- expat=2.5.*
- fontconfig=2.14.*
- fonts-conda-ecosystem
- fonts-conda-forge
- fonttools=4.38.*
- font-ttf-dejavu-sans-mono=2.*
- font-ttf-inconsolata=3.*
- font-ttf-source-code-pro=2.*
- font-ttf-ubuntu=0.*
- freetype=2.12.*
- fribidi=1.0.*
- gdk-pixbuf=2.42.*
- gettext=0.21.*
- glib=2.74.*
- glib-tools=2.74.*
- gmp=6.2.*
- graphite2=1.3.*
- gst-plugins-base=1.22.*
- gstreamer=1.22.*
- gtk2=2.24.*
- harfbuzz=5.3.*
- hdf5=1.12.*
- icu=70.*
- idna=3.*
- ipython=8.10.*
- jedi=0.18.*
- jpeg
- kernel-headers_linux-64=2.6.*
- kiwisolver=1.4.*
- krb5=1.20.*
- lcms2=2.*
- ld64_osx-64
- ld_impl_linux-64=2.*
- lerc=4.0.*
- libaec=1.0.*
- libblas=3.9.*
- libbrotlicommon=1.0.*
- libbrotlidec=1.0.*
- libbrotlienc=1.0.*
- libcblas=3.9.*
- libclang-cpp14=14.0.*
- libcurl=7.88.*
- libcxx=14.0.*
- libdeflate=1.*
- libedit=3.1.*
- libev=4.*
- libffi=3.4.*
- _libgcc_mutex=0.*
- libglib=2.74.*
- libiconv=1.*
- liblapack=3.9.*
- libllvm14=14.0.*
- libnghttp2=1.51.*
- libogg=1.3.*
- libopenblas=0.3.*
- libopus=1.3.*
- libpng=1.6.*
- libsqlite=3.40.*
- libssh2=1.10.*
- libtiff=4.5.*
- libuuid=2.32.*
- libuv=1.44.*
- libvorbis=1.3.*
- libwebp-base=1.2.*
- libxcb=1.*
- libxml2=2.10.*
- libzlib=1.2.*
- lld=15.0.7
- llvm-openmp=15.0.*
- llvm-tools=14.0.*
- lz4-c=1.9.*
- make=4.*
- matplotlib-base=3.7.*
- matplotlib-inline=0.1.*
- mpfr=4.1.*
- munkres=1.1.*
- ncurses=6.*
- numpy=1.21.*
- openjpeg=2.5.*
- openssl=3.0.*
- packaging=23.*
- pango=1.50.*
- parso=0.8.*
- pathlib2
- pcre2=10.*
- pcre=8.*
- pexpect=4.8.*
- pickleshare=0.7.*
- pillow=9.4.*
- pip=23.0.*
- pixman=0.40.*
- popt=1.*
- prompt-toolkit=3.0.*
- pthread-stubs=0.*
- ptyprocess=0.7.*
- pure_eval=0.2.*
- pycparser=2.*
- pygments=2.11.*
- pyopenssl=23.0.*
- pyparsing=3.0.*
- pysocks=1.7.*
- python=3.10.*
- python_abi=3.*
- python-dateutil=2.8.*
- pyyaml=6.*
- rapidjson=1.1.*
- readline=8.1.*
- requests=2.28.*
- rhash=1.4.*
- rsync=3.2.*
- setuptools=67.4.*
- sigtool=0.1.*
- six=1.16.*
- sqlite=3.40.*
- stack_data=0.6.*
- sysroot_linux-64=2.*
- tapi=1100.0.*
- texlive-core
- tk=8.6.*
- traitlets=5.9.*
- tzdata
- unicodedata2=15.0.*
- urllib3=1.26.*
- wcwidth=0.2.*
- wheel=0.38.*
- wxpython=4.2.*
- xorg-kbproto=1.0.*
- xorg-libice=1.0.*
- xorg-libsm=1.2.*
- xorg-libx11=1.7.*
- xorg-libxau=1.0.*
- xorg-libxdmcp=1.1.*
- xorg-libxext=1.3.*
- xorg-libxrender=0.9.*
- xorg-renderproto=0.11.*
- xorg-xextproto=7.3.*
- xorg-xproto=7.0.*
- xxhash=0.8.*
- xz=5.2.*
- yaml=0.2.*
- yaml-cpp=0.7.*
- zlib=1.2.*
- zstd=1.5.*
Loading
Loading