Skip to content

Commit 5a732ea

Browse files
Yangzheng BaiYangzheng Bai
authored andcommitted
Fix config file absolute path issue for jenkins
1. Refactoring and simplifying unittest param generation 2. Fix some minor bugs which may generate invalid parameters for sweeptest 3. Verified on both aarch64 and x86_64 systems
1 parent 6134136 commit 5a732ea

File tree

2 files changed

+138
-116
lines changed

2 files changed

+138
-116
lines changed

benchmarks/lockhammer/scripts/lh_test_cfg.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434

3535
## Global Settings
3636
globalcfg:
37-
execdir: /tmp/synchronization-benchmarks/benchmarks/lockhammer/build
38-
logfile: /tmp/lockhammer.csv
37+
execdir: /root/synchronization-benchmarks/benchmarks/lockhammer/build
38+
logfile: /root/lockhammer.csv
3939

4040
## Sweep Test Settings
4141
#
@@ -52,25 +52,24 @@ globalcfg:
5252
sweeptest:
5353
enabled: False
5454
safemode: False
55-
workload:
55+
cmd:
5656
- lh_cas_event_mutex
5757
- lh_cas_lockref
5858
- lh_cas_rw_lock
5959
- lh_empty
6060
- lh_event_mutex
61-
- lh_hybrid_spinlock
62-
- lh_hybrid_spinlock_fastdequeue
6361
- lh_incdec_refcount
6462
- lh_jvm_objectmonitor
6563
- lh_osq_lock
6664
- lh_queued_spinlock
6765
- lh_swap_mutex
6866
- lh_tbb_spin_rw_mutex
6967
- lh_ticket_spinlock
70-
repeat: 7
68+
cmd_aarch64: [lh_hybrid_spinlock, lh_hybrid_spinlock_fastdequeue]
69+
cmd_x86_64:
70+
repeat: 9
7171
sweepargu: t
7272
argumax: 0
73-
arguoffset: 0
7473
skipsince: 48
7574
skipstep: 8
7675
argulist:
@@ -92,6 +91,7 @@ sweeptest:
9291
# Common assumptions for unittest:
9392
# Only cover functional correctness, use as least time as possible
9493
# Normal runtime should be around 1 minute
94+
# t=0 means maximum core count
9595
#
9696
##
9797
unittest:
@@ -113,13 +113,13 @@ unittest:
113113
- lh_ticket_spinlock
114114
cmd_aarch64: [lh_hybrid_spinlock, lh_hybrid_spinlock_fastdequeue]
115115
cmd_x86_64:
116-
t: 0
116+
t: [1, 0]
117117
a: 100
118118
c: [0ns, 50ns]
119119
p: [0ns, 50ns]
120120

121121
- cmd: lh_osq_lock
122-
t: 0
122+
t: [1, 0]
123123
a: 100
124124
c: 50ns
125125
p: 0ns
@@ -128,7 +128,7 @@ unittest:
128128
s: 2
129129

130130
- cmd: lh_tbb_spin_rw_mutex
131-
t: 0
131+
t: [1, 0]
132132
a: 100
133133
c: 50ns
134134
p: 0ns

0 commit comments

Comments
 (0)