Skip to content

Commit 7b1aea4

Browse files
joaquintidesjoaquintides
committed
reported mem usage (time -v) for tests with 10M elements
1 parent 5cb909d commit 7b1aea4

File tree

4 files changed

+14
-67
lines changed

4 files changed

+14
-67
lines changed

‎.github/workflows/benchmarks.yml‎

Lines changed: 11 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
pull_request:
66
push:
77
branches:
8-
- boost_unordered_flat_map_fil-c
8+
- boost_unordered_flat_map_fil-c_memory
99

1010
jobs:
1111
posix:
@@ -19,101 +19,92 @@ jobs:
1919
sourcefile: running_insertion.cpp
2020
compileroptions: -std=c++20 -O3 -DNDEBUG -DHAVE_ABSEIL
2121
outputfile: benchmark
22-
reportdir: clang-x64
2322
# os: ubuntu-20.04
2423
os: [self-hosted, linux, x64]
2524
install: clang
26-
command: sudo cgexec -g memory,cpu:shield sudo -u gha ./benchmark
25+
command: sudo /usr/bin/time -v cgexec -g memory,cpu:shield sudo -u gha ./benchmark
2726
- name: clang-x64
2827
compiler: clang++-18
2928
architecture: -m64
3029
sourcefile: running_erasure.cpp
3130
compileroptions: -std=c++20 -O3 -DNDEBUG -DHAVE_ABSEIL
3231
outputfile: benchmark
33-
reportdir: clang-x64
3432
# os: ubuntu-20.04
3533
os: [self-hosted, linux, x64]
3634
install: clang
37-
command: sudo cgexec -g memory,cpu:shield sudo -u gha ./benchmark
35+
command: sudo /usr/bin/time -v cgexec -g memory,cpu:shield sudo -u gha ./benchmark
3836
- name: clang-x64
3937
compiler: clang++-18
4038
architecture: -m64
4139
sourcefile: scattered_lookup.cpp
4240
compileroptions: -std=c++20 -O3 -DNDEBUG -DHAVE_ABSEIL
4341
outputfile: benchmark
44-
reportdir: clang-x64
4542
# os: ubuntu-20.04
4643
os: [self-hosted, linux, x64]
4744
install: clang
48-
command: sudo cgexec -g memory,cpu:shield sudo -u gha ./benchmark
45+
command: sudo /usr/bin/time -v cgexec -g memory,cpu:shield sudo -u gha ./benchmark
4946

5047
- name: clang-x64
5148
compiler: clang++-18
5249
architecture: -m64
5350
sourcefile: running_insertion.cpp
5451
compileroptions: -fno-omit-frame-pointer -fsanitize=address -gline-tables-only -std=c++20 -O3 -DNDEBUG -DHAVE_ABSEIL
5552
outputfile: benchmark
56-
reportdir: clang-asan-x64
5753
# os: ubuntu-20.04
5854
os: [self-hosted, linux, x64]
5955
install: clang
60-
command: sudo cgexec -g memory,cpu:shield sudo -u gha ./benchmark
56+
command: sudo /usr/bin/time -v cgexec -g memory,cpu:shield sudo -u gha ./benchmark
6157
- name: clang-x64
6258
compiler: clang++-18
6359
architecture: -m64
6460
sourcefile: running_erasure.cpp
6561
compileroptions: -fno-omit-frame-pointer -fsanitize=address -gline-tables-only -std=c++20 -O3 -DNDEBUG -DHAVE_ABSEIL
6662
outputfile: benchmark
67-
reportdir: clang-asan-x64
6863
# os: ubuntu-20.04
6964
os: [self-hosted, linux, x64]
7065
install: clang
71-
command: sudo cgexec -g memory,cpu:shield sudo -u gha ./benchmark
66+
command: sudo /usr/bin/time -v cgexec -g memory,cpu:shield sudo -u gha ./benchmark
7267
- name: clang-x64
7368
compiler: clang++-18
7469
architecture: -m64
7570
sourcefile: scattered_lookup.cpp
7671
compileroptions: -fno-omit-frame-pointer -fsanitize=address -gline-tables-only -std=c++20 -O3 -DNDEBUG -DHAVE_ABSEIL
7772
outputfile: benchmark
78-
reportdir: clang-asan-x64
7973
# os: ubuntu-20.04
8074
os: [self-hosted, linux, x64]
8175
install: clang
82-
command: sudo cgexec -g memory,cpu:shield sudo -u gha ./benchmark
76+
command: sudo /usr/bin/time -v cgexec -g memory,cpu:shield sudo -u gha ./benchmark
8377

8478
- name: clang-x64
8579
compiler: fil++
8680
architecture: -m64
8781
sourcefile: running_insertion.cpp
8882
compileroptions: -std=c++20 -O3 -DNDEBUG -DHAVE_ABSEIL -DBOOST_ALL_NO_EMBEDDED_GDB_SCRIPTS
8983
outputfile: benchmark
90-
reportdir: fil-c-x64
9184
# os: ubuntu-20.04
9285
os: [self-hosted, linux, x64]
9386
install: clang
94-
command: sudo cgexec -g memory,cpu:shield sudo -u gha ./benchmark
87+
command: sudo /usr/bin/time -v cgexec -g memory,cpu:shield sudo -u gha ./benchmark
9588
- name: clang-x64
9689
compiler: fil++
9790
architecture: -m64
9891
sourcefile: running_erasure.cpp
9992
compileroptions: -std=c++20 -O3 -DNDEBUG -DHAVE_ABSEIL -DBOOST_ALL_NO_EMBEDDED_GDB_SCRIPTS
10093
outputfile: benchmark
101-
reportdir: fil-c-x64
10294
# os: ubuntu-20.04
10395
os: [self-hosted, linux, x64]
10496
install: clang
105-
command: sudo cgexec -g memory,cpu:shield sudo -u gha ./benchmark
97+
command: sudo /usr/bin/time -v cgexec -g memory,cpu:shield sudo -u gha ./benchmark
10698
- name: clang-x64
10799
compiler: fil++
108100
architecture: -m64
109101
sourcefile: scattered_lookup.cpp
110102
compileroptions: -std=c++20 -O3 -DNDEBUG -DHAVE_ABSEIL -DBOOST_ALL_NO_EMBEDDED_GDB_SCRIPTS
111103
outputfile: benchmark
112-
reportdir: fil-c-x64
113104
# os: ubuntu-20.04
114105
os: [self-hosted, linux, x64]
115106
install: clang
116-
command: sudo cgexec -g memory,cpu:shield sudo -u gha ./benchmark
107+
command: sudo /usr/bin/time -v cgexec -g memory,cpu:shield sudo -u gha ./benchmark
117108

118109
runs-on: ${{matrix.os}}
119110

@@ -164,48 +155,4 @@ jobs:
164155
run: |
165156
if [ -n "${{matrix.xcode_version}}" ]; then
166157
DEVELOPER_DIR=/Applications/Xcode-${{matrix.xcode_version}}.app/Contents/Developer
167-
fi
168-
if [ -n "${{matrix.command}}" ]; then
169-
echo "running benchmarks and saving to "${REPORT_FILE}
170-
${{matrix.command}} | tee ${REPORT_FILE}
171-
else
172-
echo "running benchmarks and saving to "${REPORT_FILE}
173-
./${{matrix.outputfile}} | tee ${REPORT_FILE}
174-
fi
175-
- name: Push benchmark results to repo
176-
run: |
177-
git config --global user.name 'joaquintides'
178-
git config --global user.email '[email protected]'
179-
git add ${REPORT_FILE}
180-
git stash -- ${REPORT_FILE}
181-
git pull
182-
git stash pop
183-
git add ${REPORT_FILE}
184-
git commit -m "updated benchmark results"
185-
git push
186-
187-
final:
188-
needs: posix
189-
190-
runs-on: ubuntu-latest
191-
container:
192-
image: python:2.7.18-buster
193-
194-
steps:
195-
- uses: actions/checkout@v3
196-
- name: Install Python packages
197-
run: |
198-
python -m pip install --upgrade pip
199-
pip install openpyxl
200-
- name: Fast-forward repo
201-
run: |
202-
git pull
203-
- name: Run data feeding script
204-
run: |
205-
./insert_data.sh
206-
- name: Push modified Excel files to repo
207-
run: |
208-
git config --global user.name 'joaquintides'
209-
git config --global user.email '[email protected]'
210-
git commit -am "updated Excel files"
211-
git push
158+
${{matrix.command}}

‎running_erasure.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ void test(
122122
const char* name1,const char* name2,const char* name3,
123123
const char* name4,const char* name5)
124124
{
125-
unsigned int n0=10000,n1=10000000,dn=500;
125+
unsigned int n0=10000000,n1=10000000,dn=500;
126126
double fdn=1.05;
127127

128128
std::cout<<title<<":"<<std::endl;

‎running_insertion.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ void test(
127127
const char* name1,const char* name2,const char* name3,
128128
const char* name4,const char* name5)
129129
{
130-
unsigned int n0=10000,n1=10000000,dn=500;
130+
unsigned int n0=10000000,n1=10000000,dn=500;
131131
double fdn=1.05;
132132

133133
initialize_data(n1);

‎scattered_lookup.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ void test(
117117
const char* name1,const char* name2,const char* name3,
118118
const char* name4,const char* name5)
119119
{
120-
unsigned int n0=10000,n1=10000000,dn=500;
120+
unsigned int n0=10000000,n1=10000000,dn=500;
121121
double fdn=1.05;
122122

123123
initialize_data(n1);

0 commit comments

Comments
 (0)