Skip to content

Bug fix in benchmark script #67

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

Merged
merged 1 commit into from
Aug 23, 2023
Merged

Bug fix in benchmark script #67

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions scripts/branch-compare.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ echo "Comparing main branch with $branch"
build_branch() {
dir_name=$1
if [ ! -d $dir_name ]; then
git clone -b $branch ${BASE_DIR} $dir_name
git clone -b $dir_name ${BASE_DIR} $dir_name
else
# if it exists, just update it
cd $dir_name
git fetch origin
git rebase origin/$branch
git rebase origin/$dir_name
# rebase fails with conflict, delete and start over
if [ "$?" != 0 ]; then
cd ..
rm -rf $branch
git clone -b $branch ${BASE_DIR} $dir_name
rm -rf $dir_name
git clone -b $dir_name ${BASE_DIR} $dir_name
else
cd ..
fi
Expand All @@ -40,8 +40,8 @@ fi
compare=$(realpath google-benchmark/tools/compare.py)
build_branch $branch
build_branch "main"
baseline=$(realpath ${branch}/builddir/benchexe)
contender=$(realpath main/builddir/benchexe)
contender=$(realpath ${branch}/builddir/benchexe)
baseline=$(realpath main/builddir/benchexe)

if [ -z "$1" ]; then
echo "Comparing all benchmarks .."
Expand Down