diff --git a/Makefile b/Makefile index 552cb04..6595d81 100644 --- a/Makefile +++ b/Makefile @@ -85,7 +85,7 @@ distinct_id: checkht comparison: checkht git submodule update --init --recursive - cd library/simdjson && make clean && cd ../.. + git -C library/simdjson clean -xdf . docker build -f experiments/comparison/Dockerfile -t comparison . $(eval outputdir:=$(PWD)/results/$(nodename)/comparison) @echo $(outputdir) diff --git a/experiments/comparison/Dockerfile b/experiments/comparison/Dockerfile index 836f302..ce622e2 100644 --- a/experiments/comparison/Dockerfile +++ b/experiments/comparison/Dockerfile @@ -1,5 +1,6 @@ FROM gcc:9.1 COPY . /usr/src/ WORKDIR /usr/src/experiments/comparison +RUN apt update && apt install cmake -y RUN ./build.sh CMD ["bash", "run.sh"] diff --git a/experiments/comparison/build.sh b/experiments/comparison/build.sh index 33fe28e..d962ff7 100755 --- a/experiments/comparison/build.sh +++ b/experiments/comparison/build.sh @@ -1,4 +1,13 @@ #!/bin/bash +set -eux SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )" cd $SCRIPTPATH/../../library/simdjson -make -k parsingcompetition allparsingcompetition +mkdir build-benchmark +cd build-benchmark +cmake .. -DCMAKE_BUILD_TYPE=Release +# older cmake (3.13) needs one target at a time +cmake --build . -j $(nproc) --target parsingcompetition +cmake --build . -j $(nproc) --target allparsingcompetition + +echo "$0: done building" + diff --git a/experiments/comparison/run.sh b/experiments/comparison/run.sh index 8819468..ad62c5f 100755 --- a/experiments/comparison/run.sh +++ b/experiments/comparison/run.sh @@ -5,9 +5,9 @@ cd $SCRIPTPATH/../../library/simdjson for i in jsonexamples/*.json; do [ -f "$i" ] || break shortname=$(basename $i .json).table - ./parsingcompetition -t $i > $RESULTSPATH/$shortname - ./parsingcompetition $i > $RESULTSPATH/detailed$shortname - ./allparsingcompetition -t $i > $RESULTSPATH/all$shortname + build-benchmark/benchmark/parsingcompetition -t $i > $RESULTSPATH/$shortname + build-benchmark/benchmark/parsingcompetition $i > $RESULTSPATH/detailed$shortname + build-benchmark/benchmark/allparsingcompetition -t $i > $RESULTSPATH/all$shortname echo -n "." done echo diff --git a/library/simdjson b/library/simdjson index ab0e22a..a540e6a 160000 --- a/library/simdjson +++ b/library/simdjson @@ -1 +1 @@ -Subproject commit ab0e22a3169a038333a3ca9ae922571dbb18f5b1 +Subproject commit a540e6afc5fafde2ebac445d5d2b861268d467b9