Baseline Flop Count Update, New Float Baseline
This commit is contained in:
committed by
Ahmed Kallala
parent
40f4421d60
commit
43e54871df
@@ -49,7 +49,13 @@ VARIANT ?= baseline
|
||||
|
||||
VARIANT_SRC := ./variants/variant_$(VARIANT).cpp
|
||||
|
||||
SRC := main.cpp $(VARIANT_SRC)
|
||||
ifneq ($(filter float_%,$(VARIANT)),)
|
||||
MAIN_SRC := main-float.cpp
|
||||
else
|
||||
MAIN_SRC := main.cpp
|
||||
endif
|
||||
|
||||
SRC := $(MAIN_SRC) $(VARIANT_SRC)
|
||||
HEADERS := ./headers/board.hpp ./headers/pedestrian.hpp ./headers/vector2d.hpp ./headers/constants.hpp ./headers/util.hpp
|
||||
|
||||
TEST_SRC := ./tests/test_vector2d.cpp ./tests/test_board.cpp ./tests/test_forces.cpp $(VARIANT_SRC)
|
||||
@@ -57,7 +63,6 @@ TEST_TARGET := run_tests
|
||||
TEST_LIBS := -lgtest -lgtest_main -pthread
|
||||
|
||||
TARGET := main_$(VARIANT)
|
||||
SIZES_TARGET := sizes
|
||||
|
||||
|
||||
# Default simulation parameters and output files.
|
||||
@@ -94,12 +99,18 @@ BENCH_SIZES ?= 50 100 200 500 1000 2000 5000 10000
|
||||
BENCH_ITER ?= 1000
|
||||
|
||||
# Verification parameters
|
||||
|
||||
ifneq ($(filter float_%,$(VARIANT)),)
|
||||
REFERENCE_CSV ?= reference/baseline_float_n60_i4000.csv
|
||||
else
|
||||
REFERENCE_CSV ?= reference/baseline_n60_i4000.csv
|
||||
endif
|
||||
|
||||
REFERENCE_N_P ?= 60
|
||||
REFERENCE_N_ITER ?= 4000
|
||||
VERIFY_CSV := verify_$(VARIANT).csv
|
||||
|
||||
.PHONY: all main run bench run-bench bench-suite video sizes asm test clean clean-all verify
|
||||
.PHONY: all main run bench run-bench bench-suite video asm test clean clean-all verify
|
||||
|
||||
all: main
|
||||
|
||||
@@ -147,10 +158,6 @@ bench-suite: bench
|
||||
video: run
|
||||
python ./scripts/visualization.py $(CSV) $(MP4)
|
||||
|
||||
# make sizes : compile the size-check helper.
|
||||
sizes: clean
|
||||
$(CXX) $(CXXFLAGS) sizes.cpp -o $(SIZES_TARGET)
|
||||
|
||||
# make test : compile and run all unit tests.
|
||||
test: clean
|
||||
$(CXX) $(CXXFLAGS) $(TEST_SRC) $(TEST_LIBS) -o $(TEST_TARGET)
|
||||
@@ -158,7 +165,7 @@ test: clean
|
||||
|
||||
# make asm : compile and generate assembly files.
|
||||
|
||||
ASM_CPP_SRCS := main.cpp $(VARIANT_SRC) sizes.cpp
|
||||
ASM_CPP_SRCS := main.cpp main-float.cpp $(VARIANT_SRC)
|
||||
ASM_HPP_SRCS := ./headers/util.hpp
|
||||
ASM_SRCS := $(ASM_CPP_SRCS) $(ASM_HPP_SRCS)
|
||||
|
||||
@@ -174,10 +181,10 @@ asm: clean
|
||||
|
||||
# make clean : delete generated files from previous builds.
|
||||
clean:
|
||||
rm -f main_* $(SIZES_TARGET) $(TEST_TARGET) *.o *.s
|
||||
rm -f main_* $(TEST_TARGET) *.o *.s
|
||||
|
||||
# make clean-all : delete all generated files from previous builds and runs.
|
||||
# WARNING: this deletes all *.csv and *.mp4 files in this directory.
|
||||
# Move any output files you want to keep to another directory before running it.
|
||||
clean-all: clean
|
||||
rm -f *.csv *.mp4
|
||||
rm -f *.csv *.mp4
|
||||
|
||||
Reference in New Issue
Block a user