Skip to content

Commit 13367e4

Browse files
committed
Add choose YACLib branch
Add compare.sh script
1 parent 02175f5 commit 13367e4

File tree

6 files changed

+62
-10
lines changed

6 files changed

+62
-10
lines changed

.github/workflows/linux.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ jobs:
4040
c_compiler=clang-14; cxx_compiler=clang++-14
4141
fi
4242
if [[ "${{ matrix.compiler }}" == "clang_libcxx" ]]; then
43-
options="-DLIBCXX=ON -DSTD=ON -DYACLIB=ON"
43+
options="-DLIBCXX=ON -DSTD=ON -DYACLIB=main"
4444
else
45-
options=" -DSTD=ON -DYACLIB=ON -DBOOST_THREAD=ON"
45+
options=" -DSTD=ON -DYACLIB=main -DBOOST_THREAD=ON"
4646
fi
4747
cmake -S . -B $dir \
4848
-DCMAKE_BUILD_TYPE=$build_type \

future/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,10 @@ link_libraries(Threads::Threads)
3535
if (YACLIB)
3636
FetchContent_Declare(yaclib
3737
GIT_REPOSITORY https://github.com/YACLib/YACLib.git
38-
GIT_TAG main
38+
GIT_TAG "${YACLIB}"
3939
)
40+
set(YACLIB_CXX_STANDARD 20)
41+
list(APPEND YACLIB_FLAGS "ATOMIC_EVENT")
4042
FetchContent_MakeAvailable(yaclib)
4143
link_libraries(yaclib)
4244
endif ()

future/result/i7-11850H/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ mold 1.1 (89612b709638b90c8a044e2f96f47d28054ba789; compatible with GNU ld)
4141
cmake -GNinja \
4242
-DCMAKE_BUILD_TYPE=Release \
4343
-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ \
44-
-DSTD=ON -DYACLIB=ON -DFOLLY=ON -DBOOST_THREAD=ON
44+
-DSTD=ON -DYACLIB=main -DFOLLY=ON -DBOOST_THREAD=ON
4545
```
4646

4747
##### Results
@@ -255,7 +255,7 @@ mold 1.1 (89612b709638b90c8a044e2f96f47d28054ba789; compatible with GNU ld)
255255
cmake -GNinja \
256256
-DCMAKE_BUILD_TYPE=Release \
257257
-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ \
258-
-DSTD=ON -DYACLIB=ON -DFOLLY=ON -DBOOST_THREAD=ON
258+
-DSTD=ON -DYACLIB=main -DFOLLY=ON -DBOOST_THREAD=ON
259259
```
260260

261261
##### Results
@@ -470,7 +470,7 @@ cmake -GNinja \
470470
-DCMAKE_BUILD_TYPE=Release \
471471
-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ \
472472
-DLIBCXX=ON \
473-
-DSTD=ON -DYACLIB=ON
473+
-DSTD=ON -DYACLIB=main
474474
```
475475

476476
##### Results

script/build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@ cmake -S . -B ./build_clang_libcxx \
44
-GNinja \
55
-DCMAKE_BUILD_TYPE=Release \
66
-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ \
7-
-DLIBCXX=ON -DSTD=ON -DYACLIB=ON
7+
-DLIBCXX=ON -DSTD=ON -DYACLIB=main
88

99
cmake -S . -B ./build_clang_libstdcxx \
1010
-GNinja \
1111
-DCMAKE_BUILD_TYPE=Release \
1212
-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ \
13-
-DSTD=ON -DYACLIB=ON -DFOLLY=ON -DBOOST_THREAD=ON
13+
-DSTD=ON -DYACLIB=main -DFOLLY=ON -DBOOST_THREAD=ON
1414

1515
cmake -S . -B ./build_gcc_libstdcxx \
1616
-GNinja \
1717
-DCMAKE_BUILD_TYPE=Release \
1818
-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ \
19-
-DSTD=ON -DYACLIB=ON -DFOLLY=ON -DBOOST_THREAD=ON
19+
-DSTD=ON -DYACLIB=main -DFOLLY=ON -DBOOST_THREAD=ON
2020

2121
ninja -C ./build_clang_libcxx
2222

script/compare.sh

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
#!/usr/bin/env bash
2+
3+
for i in "$@"; do
4+
case $i in
5+
--branch=*)
6+
branch="${i#*=}"
7+
shift
8+
;;
9+
-* | --*)
10+
echo "Unknown option $i"
11+
exit 1
12+
;;
13+
*) ;;
14+
esac
15+
done
16+
17+
if [[ -z "$branch" ]]; then
18+
echo "You should specify --branch=... option"
19+
exit 1
20+
fi
21+
22+
cmake -S . -B ./build_folly \
23+
-GNinja \
24+
-DCMAKE_BUILD_TYPE=Release \
25+
-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ \
26+
-DFOLLY=ON
27+
cmake -S . -B ./build_main \
28+
-GNinja \
29+
-DCMAKE_BUILD_TYPE=Release \
30+
-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ \
31+
-DYACLIB="main"
32+
if [ "$branch" != "main" ]; then
33+
cmake -S . -B "./build_$branch" \
34+
-GNinja \
35+
-DCMAKE_BUILD_TYPE=Release \
36+
-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ \
37+
-DYACLIB="$branch"
38+
fi
39+
40+
ninja -C ./build_folly
41+
ninja -C ./build_main
42+
if [ "$branch" != "main" ]; then
43+
ninja -C "./build_$branch"
44+
fi
45+
46+
./build_folly/future/future
47+
./build_main/future/future
48+
if [ "$branch" != "main" ]; then
49+
./build_$branch/future/future
50+
fi

script/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ for i in "$@"; do
1515
done
1616

1717
if [[ -z "$proc" ]]; then
18-
echo "You should specify --proc="" option"
18+
echo "You should specify --proc=... option"
1919
exit 1
2020
fi
2121

0 commit comments

Comments
 (0)