Skip to content

Commit bd3d409

Browse files
SiarheiFedartsouSiarheiFedartsou
committed
wip
1 parent 668dafc commit bd3d409

File tree

3 files changed

+52
-49
lines changed

3 files changed

+52
-49
lines changed

‎.github/workflows/osrm-backend.yml‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -719,41 +719,41 @@ jobs:
719719
make -j$(nproc) benchmarks
720720
cd ..
721721
make -C test/data
722-
- name: Build PR Branch
723-
run: |
724-
cd pr
725-
npm ci --ignore-scripts
726-
cd ..
727-
mkdir -p pr/build
728-
cd pr/build
729-
cmake -DENABLE_CONAN=ON -DCMAKE_BUILD_TYPE=Release -DENABLE_NODE_BINDINGS=ON ..
730-
make -j$(nproc)
731-
make -j$(nproc) benchmarks
732-
cd ..
733-
make -C test/data
722+
# - name: Build PR Branch
723+
# run: |
724+
# cd pr
725+
# npm ci --ignore-scripts
726+
# cd ..
727+
# mkdir -p pr/build
728+
# cd pr/build
729+
# cmake -DENABLE_CONAN=ON -DCMAKE_BUILD_TYPE=Release -DENABLE_NODE_BINDINGS=ON ..
730+
# make -j$(nproc)
731+
# make -j$(nproc) benchmarks
732+
# cd ..
733+
# make -C test/data
734734
# we run benchmarks in tmpfs to avoid impact of disk IO
735735
- name: Create folder for tmpfs
736736
run: |
737737
# if by any chance it was mounted before(e.g. due to previous job failed), unmount it
738738
sudo umount ~/benchmarks | true
739739
rm -rf ~/benchmarks
740740
mkdir -p ~/benchmarks
741-
# see https://llvm.org/docs/Benchmarking.html
742-
- name: Run PR Benchmarks
743-
run: |
744-
sudo cset shield -c 2-3 -k on
745-
sudo mount -t tmpfs -o size=4g none ~/benchmarks
746-
cp -rf pr/build ~/benchmarks/build
747-
cp -rf pr/lib ~/benchmarks/lib
748-
mkdir -p ~/benchmarks/test
749-
cp -rf pr/test/data ~/benchmarks/test/data
750-
cp -rf pr/profiles ~/benchmarks/profiles
751-
752-
ls ~/benchmarks/test/data
753-
754-
sudo cset shield --exec -- ./pr/scripts/ci/run_benchmarks.sh -f ~/benchmarks -r $(pwd)/pr_results -s $(pwd)/pr -b ~/benchmarks/build -o ~/data.osm.pbf -g ~/gps_traces.csv
755-
sudo umount ~/benchmarks
756-
sudo cset shield --reset
741+
# # see https://llvm.org/docs/Benchmarking.html
742+
# - name: Run PR Benchmarks
743+
# run: |
744+
# sudo cset shield -c 2-3 -k on
745+
# sudo mount -t tmpfs -o size=4g none ~/benchmarks
746+
# cp -rf pr/build ~/benchmarks/build
747+
# cp -rf pr/lib ~/benchmarks/lib
748+
# mkdir -p ~/benchmarks/test
749+
# cp -rf pr/test/data ~/benchmarks/test/data
750+
# cp -rf pr/profiles ~/benchmarks/profiles
751+
752+
# ls ~/benchmarks/test/data
753+
754+
# sudo cset shield --exec -- ./pr/scripts/ci/run_benchmarks.sh -f ~/benchmarks -r $(pwd)/pr_results -s $(pwd)/pr -b ~/benchmarks/build -o ~/data.osm.pbf -g ~/gps_traces.csv
755+
# sudo umount ~/benchmarks
756+
# sudo cset shield --reset
757757
- name: Run Base Benchmarks
758758
run: |
759759
sudo cset shield -c 2-3 -k on
@@ -772,9 +772,9 @@ jobs:
772772
sudo cset shield --exec -- cset shield --exec -- ./pr/scripts/ci/run_benchmarks.sh -f ~/benchmarks -r $(pwd)/base_results -s $(pwd)/pr -b ~/benchmarks/build -o ~/data.osm.pbf -g ~/gps_traces.csv
773773
sudo umount ~/benchmarks
774774
sudo cset shield --reset
775-
- name: Post Benchmark Results
776-
run: |
777-
python3 pr/scripts/ci/post_benchmark_results.py base_results pr_results
775+
# - name: Post Benchmark Results
776+
# run: |
777+
# python3 pr/scripts/ci/post_benchmark_results.py base_results pr_results
778778
- name: Show CCache statistics
779779
run: |
780780
ccache -p

‎scripts/ci/run_benchmarks.sh‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -54,28 +54,28 @@ function run_benchmarks_for_folder {
5454

5555
BENCHMARKS_FOLDER="$BINARIES_FOLDER/src/benchmarks"
5656

57-
echo "Running match-bench MLD"
58-
$BENCHMARKS_FOLDER/match-bench "$FOLDER/test/data/mld/monaco.osrm" mld > "$RESULTS_FOLDER/match_mld.bench"
59-
echo "Running match-bench CH"
60-
$BENCHMARKS_FOLDER/match-bench "$FOLDER/test/data/ch/monaco.osrm" ch > "$RESULTS_FOLDER/match_ch.bench"
61-
echo "Running route-bench MLD"
62-
$BENCHMARKS_FOLDER/route-bench "$FOLDER/test/data/mld/monaco.osrm" mld > "$RESULTS_FOLDER/route_mld.bench"
63-
echo "Running route-bench CH"
64-
$BENCHMARKS_FOLDER/route-bench "$FOLDER/test/data/ch/monaco.osrm" ch > "$RESULTS_FOLDER/route_ch.bench"
65-
echo "Running alias"
66-
$BENCHMARKS_FOLDER/alias-bench > "$RESULTS_FOLDER/alias.bench"
67-
echo "Running json-render-bench"
57+
# echo "Running match-bench MLD"
58+
# $BENCHMARKS_FOLDER/match-bench "$FOLDER/test/data/mld/monaco.osrm" mld > "$RESULTS_FOLDER/match_mld.bench"
59+
# echo "Running match-bench CH"
60+
# $BENCHMARKS_FOLDER/match-bench "$FOLDER/test/data/ch/monaco.osrm" ch > "$RESULTS_FOLDER/match_ch.bench"
61+
# echo "Running route-bench MLD"
62+
# $BENCHMARKS_FOLDER/route-bench "$FOLDER/test/data/mld/monaco.osrm" mld > "$RESULTS_FOLDER/route_mld.bench"
63+
# echo "Running route-bench CH"
64+
# $BENCHMARKS_FOLDER/route-bench "$FOLDER/test/data/ch/monaco.osrm" ch > "$RESULTS_FOLDER/route_ch.bench"
65+
# echo "Running alias"
66+
# $BENCHMARKS_FOLDER/alias-bench > "$RESULTS_FOLDER/alias.bench"
67+
# echo "Running json-render-bench"
6868
$BENCHMARKS_FOLDER/json-render-bench "$FOLDER/test/data/portugal_to_korea.json" #> "$RESULTS_FOLDER/json-render.bench"
6969
echo "Running packedvector-bench"
70-
$BENCHMARKS_FOLDER/packedvector-bench > "$RESULTS_FOLDER/packedvector.bench"
71-
echo "Running rtree-bench"
72-
$BENCHMARKS_FOLDER/rtree-bench "$FOLDER/test/data/monaco.osrm.ramIndex" "$FOLDER/test/data/monaco.osrm.fileIndex" "$FOLDER/test/data/monaco.osrm.nbg_nodes" > "$RESULTS_FOLDER/rtree.bench"
70+
# $BENCHMARKS_FOLDER/packedvector-bench > "$RESULTS_FOLDER/packedvector.bench"
71+
# echo "Running rtree-bench"
72+
# $BENCHMARKS_FOLDER/rtree-bench "$FOLDER/test/data/monaco.osrm.ramIndex" "$FOLDER/test/data/monaco.osrm.fileIndex" "$FOLDER/test/data/monaco.osrm.nbg_nodes" > "$RESULTS_FOLDER/rtree.bench"
7373

74-
cp -rf $OSM_PBF $FOLDER/data.osm.pbf
74+
# cp -rf $OSM_PBF $FOLDER/data.osm.pbf
7575

76-
echo "Running osrm-extract"
77-
measure_peak_ram_and_time "$BINARIES_FOLDER/osrm-extract -p $FOLDER/profiles/car.lua $FOLDER/data.osm.pbf" "$RESULTS_FOLDER/osrm_extract.bench"
78-
# echo "Running osrm-partition"
76+
# echo "Running osrm-extract"
77+
# measure_peak_ram_and_time "$BINARIES_FOLDER/osrm-extract -p $FOLDER/profiles/car.lua $FOLDER/data.osm.pbf" "$RESULTS_FOLDER/osrm_extract.bench"
78+
# # echo "Running osrm-partition"
7979
# measure_peak_ram_and_time "$BINARIES_FOLDER/osrm-partition $FOLDER/data.osrm" "$RESULTS_FOLDER/osrm_partition.bench"
8080
# echo "Running osrm-customize"
8181
# measure_peak_ram_and_time "$BINARIES_FOLDER/osrm-customize $FOLDER/data.osrm" "$RESULTS_FOLDER/osrm_customize.bench"

‎src/benchmarks/json_render.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,10 @@ int main(int argc, char **argv)
9999
return EXIT_FAILURE;
100100
}
101101

102+
std::cerr << "before: " << argv[1] << std::endl;
103+
102104
const auto obj = load(argv[1]);
105+
std::cerr << "after: " << argv[1] << std::endl;
103106

104107
TIMER_START(string);
105108
std::string out_str;

0 commit comments

Comments
 (0)