dbautist/nixos-riscv
1
0
Fork 0
forked from rarias/nixos-riscv
Code Pull Requests Actions Activity

Change rvb to rvb-clang and fix benchmarks

Browse Source
This commit is contained in:
Dylan Bautista 2025-01-22 17:03:22 +01:00 committed by Rodrigo Arias Mallo
parent c09bdbef96
commit 6185599b70
4 changed files with 39 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configuration.nix
View File

@ -42,7 +42,7 @@
#environment.systemPackages = with pkgs; [ vim gdb neofetch gcc bintools ]; #environment.systemPackages = with pkgs; [ vim gdb neofetch gcc bintools ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
rvb riscv-tools stream spec-cpu-mini rvb-clang riscv-tools stream spec-cpu-mini
config.boot.kernelPackages.perf config.boot.kernelPackages.perf
]; ];

22
lagarto-ox.nix
View File

@ -436,17 +436,25 @@
lulesh2.0 -s 4 lulesh2.0 -s 4
jacobi2d_scalar_vanilla 16 2 jacobi2d_scalar_vanilla 16 2
# desktop_benchmarks
#blackscholes
#streamcluster
# micro_benchmarks (NO WORKING BENCHMARKS FOR NOW...) hacckernels-autovectorisation 10
hacckernels-scalar 10
# desktop_benchmarks
blackscholes_scalar 1 ${final.blackscholesInput} /dev/null blackscholes_scalar 1 ${final.blackscholesInput} /dev/null
streamcluster_scalar 3 10 16 16 16 10 none output.txt 1
streamcluster_scalar 3 10 16 16 16 10 none output.txt 1
canneal_scalar 1 100 300
canneal_vectorial_intrinsics
pathfinder_serial.exe 64 64 output_64_64.txt
pathfinder_vector.exe 64 64 output_64_64.txt
swaptions_scalar -ns 2 -sm 1024 -nt 1
# micro_benchmarks (NO WORKING BENCHMARKS FOR NOW...)
# Give me a shell at the end # Give me a shell at the end
bash -l bash -l

2
overlay.nix
View File

@ -3,7 +3,7 @@ final: prev:
# Changes to packages from nixpkgs # Changes to packages from nixpkgs
{ {
clangEpi = final.callPackage ./pkgs/llvm-epi/default.nix { openmp = null; }; clangEpi = final.callPackage ./pkgs/llvm-epi/default.nix { };
clangEpiUnwrapped = final.callPackage ./pkgs/llvm-epi/clang.nix { }; clangEpiUnwrapped = final.callPackage ./pkgs/llvm-epi/clang.nix { };
stdenvClangEpi = final.stdenv.override { cc = final.buildPackages.clangEpi; allowedRequisites = null; }; stdenvClangEpi = final.stdenv.override { cc = final.buildPackages.clangEpi; allowedRequisites = null; };

44
pkgs/rvb/Makefile
View File

@ -2,14 +2,13 @@ include Makefile.in
HPC_BENCHMARKS_DIRS=\ HPC_BENCHMARKS_DIRS=\
axpy \ axpy \
jacobi-2d \
somier \
gemm \ gemm \
hacckernels \
jacobi-2d \
lulesh \ lulesh \
# hacckernels \ somier \
# fftv \ spmv-ellpack \
# spmv-ellpack \ stream \
# stream \
# Require submodules # Require submodules
# fftp \ # fftp \
# Missing compare_array_double: # Missing compare_array_double:
@ -20,17 +19,18 @@ DESKTOP_BENCHMARKS_DIRS=\
blackscholes \ blackscholes \
canneal \ canneal \
streamcluster \ streamcluster \
# pathfinder \ pathfinder \
swaptions \
# particlefilter \ # particlefilter \
# swaptions \
MICRO_BENCHMARKS_DIRS=\ MICRO_BENCHMARKS_DIRS=\
#BuffCopyStrided \ #BuffCopyStrided \
#BuffCopyIndexed \ #BuffCopyUnit \
#FpuMicroKernel \ #FpuMicroKernel \
#InstrNopBalance \
#BuffCopyIndexed \
#MemArithBalance \ #MemArithBalance \
#LatencyVrgather \ #LatencyVrgather \
# BuffCopyUnit
.PHONY: default all clean $(HPC_BENCHMARKS_DIRS) $(MICRO_BENCHMARKS_DIRS) .PHONY: default all clean $(HPC_BENCHMARKS_DIRS) $(MICRO_BENCHMARKS_DIRS)
@ -38,26 +38,26 @@ all: base
default: default:
cd common; make; cd .. cd common; make; cd ..
$(foreach dir,$(HPC_BENCHMARKS_DIRS),${MAKE} -C hpc_benchmarks/$(dir);) $(foreach dir,$(HPC_BENCHMARKS_DIRS),${MAKE} -C hpc_benchmarks/$(dir) || exit;)
$(foreach dir,$(DESKTOP_BENCHMARKS_DIRS),${MAKE} -C desktop_benchmarks/$(dir);) $(foreach dir,$(DESKTOP_BENCHMARKS_DIRS),${MAKE} -C desktop_benchmarks/$(dir) || exit;)
$(foreach dir,$(MICRO_BENCHMARKS_DIRS),${MAKE} -C micro_benchmarks/$(dir);) $(foreach dir,$(MICRO_BENCHMARKS_DIRS),${MAKE} -C micro_benchmarks/$(dir) || exit;)
all-types: all-types:
cd common; make all; cd .. cd common; make all; cd ..
$(foreach dir,$(HPC_BENCHMARKS_DIRS),${MAKE} -C hpc_benchmarks/$(dir) all ;) $(foreach dir,$(HPC_BENCHMARKS_DIRS),${MAKE} -C hpc_benchmarks/$(dir) all || exit;)
$(foreach dir,$(DESKTOP_BENCHMARKS_DIRS),${MAKE} -C desktop_benchmarks/$(dir) all ;) $(foreach dir,$(DESKTOP_BENCHMARKS_DIRS),${MAKE} -C desktop_benchmarks/$(dir) all || exit;)
$(foreach dir,$(MICRO_BENCHMARKS_DIRS),${MAKE} -C micro_benchmarks/$(dir) all ;) $(foreach dir,$(MICRO_BENCHMARKS_DIRS),${MAKE} -C micro_benchmarks/$(dir) all || exit;)
base: base:
cd common; make all; cd .. cd common; make all; cd ..
$(foreach dir,$(HPC_BENCHMARKS_DIRS),${MAKE} -C hpc_benchmarks/$(dir) base ;) $(foreach dir,$(HPC_BENCHMARKS_DIRS),${MAKE} -C hpc_benchmarks/$(dir) base || exit;)
$(foreach dir,$(DESKTOP_BENCHMARKS_DIRS),${MAKE} -C desktop_benchmarks/$(dir) base ;) $(foreach dir,$(DESKTOP_BENCHMARKS_DIRS),${MAKE} -C desktop_benchmarks/$(dir) base || exit;)
$(foreach dir,$(MICRO_BENCHMARKS_DIRS),${MAKE} -C micro_benchmarks/$(dir) base ;) $(foreach dir,$(MICRO_BENCHMARKS_DIRS),${MAKE} -C micro_benchmarks/$(dir) base || exit;)
install: install:
$(foreach dir,$(HPC_BENCHMARKS_DIRS),${MAKE} -C hpc_benchmarks/$(dir) install ;) $(foreach dir,$(HPC_BENCHMARKS_DIRS),${MAKE} -C hpc_benchmarks/$(dir) install || exit;)
$(foreach dir,$(DESKTOP_BENCHMARKS_DIRS),${MAKE} -C desktop_benchmarks/$(dir) install ;) $(foreach dir,$(DESKTOP_BENCHMARKS_DIRS),${MAKE} -C desktop_benchmarks/$(dir) install || exit;)
$(foreach dir,$(MICRO_BENCHMARKS_DIRS),${MAKE} -C micro_benchmarks/$(dir) install ;) $(foreach dir,$(MICRO_BENCHMARKS_DIRS),${MAKE} -C micro_benchmarks/$(dir) install || exit;)
fftp: fftp:
${MAKE} -C third_party fftw ${MAKE} -C third_party fftw