Skip to content

Commit 5821147

Browse files
smarrsmarr
authored
Truffle Update, and ReBench compatibility (#223)
2 parents 24e846d + 89d762f commit 5821147

File tree

3 files changed

+90
-90
lines changed

3 files changed

+90
-90
lines changed

‎.gitlab-ci.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -167,9 +167,9 @@ benchmark-y1:
167167
- *DOWNLOAD_BINARIES
168168

169169
# Profile
170-
- rebench -c --experiment="CI ID $CI_PIPELINE_ID" --branch="$CI_COMMIT_REF_NAME" rebench.conf profiling m:yuria
170+
- rebench -c --experiment="CI ID $CI_PIPELINE_ID" --branch="$CI_COMMIT_REF_NAME" rebench.conf profiling t:yuria
171171
# Run Benchmarks
172-
- rebench -c --experiment="CI ID $CI_PIPELINE_ID" --branch="$CI_COMMIT_REF_NAME" rebench.conf m:yuria
172+
- rebench -c --experiment="CI ID $CI_PIPELINE_ID" --branch="$CI_COMMIT_REF_NAME" rebench.conf t:yuria
173173
after_script:
174174
- sudo reown-project.sh
175175

@@ -182,9 +182,9 @@ benchmark-y2:
182182
- *DOWNLOAD_BINARIES
183183

184184
# Profile
185-
- rebench -c --experiment="CI ID $CI_PIPELINE_ID" --branch="$CI_COMMIT_REF_NAME" rebench.conf profiling m:yuria2
185+
- rebench -c --experiment="CI ID $CI_PIPELINE_ID" --branch="$CI_COMMIT_REF_NAME" rebench.conf profiling t:yuria2
186186
# Run Benchmarks
187-
- rebench -c --experiment="CI ID $CI_PIPELINE_ID" --branch="$CI_COMMIT_REF_NAME" rebench.conf m:yuria2
187+
- rebench -c --experiment="CI ID $CI_PIPELINE_ID" --branch="$CI_COMMIT_REF_NAME" rebench.conf t:yuria2
188188
after_script:
189189
- sudo reown-project.sh
190190

@@ -197,9 +197,9 @@ benchmark-y3:
197197
- *DOWNLOAD_BINARIES
198198

199199
# Profile
200-
- rebench -c --experiment="CI ID $CI_PIPELINE_ID" --branch="$CI_COMMIT_REF_NAME" rebench.conf profiling m:yuria3
200+
- rebench -c --experiment="CI ID $CI_PIPELINE_ID" --branch="$CI_COMMIT_REF_NAME" rebench.conf profiling t:yuria3
201201
# Run Benchmarks
202-
- rebench -c --experiment="CI ID $CI_PIPELINE_ID" --branch="$CI_COMMIT_REF_NAME" rebench.conf m:yuria3
202+
- rebench -c --experiment="CI ID $CI_PIPELINE_ID" --branch="$CI_COMMIT_REF_NAME" rebench.conf t:yuria3
203203
after_script:
204204
- sudo reown-project.sh
205205

@@ -212,9 +212,9 @@ benchmark-y4:
212212
- *DOWNLOAD_BINARIES
213213

214214
# Profile
215-
- rebench -c --experiment="CI ID $CI_PIPELINE_ID" --branch="$CI_COMMIT_REF_NAME" rebench.conf profiling m:yuria4 || true
215+
- rebench -c --experiment="CI ID $CI_PIPELINE_ID" --branch="$CI_COMMIT_REF_NAME" rebench.conf profiling t:yuria4 || true
216216
# Run Benchmarks
217-
- rebench -c --experiment="CI ID $CI_PIPELINE_ID" --branch="$CI_COMMIT_REF_NAME" rebench.conf m:yuria4
217+
- rebench -c --experiment="CI ID $CI_PIPELINE_ID" --branch="$CI_COMMIT_REF_NAME" rebench.conf t:yuria4
218218
after_script:
219219
- sudo reown-project.sh
220220

‎mx.trufflesom/suite.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
{
1717
"name": "truffle",
1818
"subdir": True,
19-
"version": "7227e7620849054055835c6719acba43d48e36c4",
19+
"version": "6339bcd8f1ca06eee25877838d92ca1256cbbf02",
2020
"urls": [{"url": "https://github.com/oracle/graal", "kind": "git"}],
2121
},
2222
]

‎rebench.conf

Lines changed: 81 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -23,137 +23,137 @@ benchmark_suites:
2323
iterations: 1
2424
invocations: 5
2525
benchmarks:
26-
- Richards: {extra_args: 1, machines: [yuria4]}
27-
- DeltaBlue: {extra_args: 100, machines: [yuria4]}
28-
- NBody: {extra_args: 1000, machines: [yuria3]}
29-
- Json: {extra_args: 1, machines: [yuria4]}
30-
- GraphSearch: {extra_args: 7, machines: [yuria2]}
31-
- PageRank: {extra_args: 75, machines: [yuria3]}
26+
- Richards: {extra_args: 1, tags: [yuria4]}
27+
- DeltaBlue: {extra_args: 100, tags: [yuria4]}
28+
- NBody: {extra_args: 1000, tags: [yuria3]}
29+
- Json: {extra_args: 1, tags: [yuria4]}
30+
- GraphSearch: {extra_args: 7, tags: [yuria2]}
31+
- PageRank: {extra_args: 75, tags: [yuria3]}
3232

3333
macro-steady:
3434
gauge_adapter: RebenchLog
3535
command: *MACRO_CMD
3636
benchmarks:
37-
- Richards: {extra_args: 40, warmup: 30, iterations: 130, machines: [yuria4]}
38-
- DeltaBlue: {extra_args: 10000, warmup: 20, iterations: 120, machines: [yuria4]}
39-
- NBody: {extra_args: 200000, warmup: 20, iterations: 120, machines: [yuria3]}
40-
- Json: {extra_args: 80, warmup: 20, iterations: 120, machines: [yuria4]}
41-
- GraphSearch: {extra_args: 25, warmup: 100, iterations: 250, machines: [yuria4]}
42-
- PageRank: {extra_args: 1000, warmup: 20, iterations: 120, machines: [yuria3]}
37+
- Richards: {extra_args: 40, warmup: 30, iterations: 130, tags: [yuria4]}
38+
- DeltaBlue: {extra_args: 10000, warmup: 20, iterations: 120, tags: [yuria4]}
39+
- NBody: {extra_args: 200000, warmup: 20, iterations: 120, tags: [yuria3]}
40+
- Json: {extra_args: 80, warmup: 20, iterations: 120, tags: [yuria4]}
41+
- GraphSearch: {extra_args: 25, warmup: 100, iterations: 250, tags: [yuria4]}
42+
- PageRank: {extra_args: 1000, warmup: 20, iterations: 120, tags: [yuria3]}
4343

4444
awfy-startup:
4545
gauge_adapter: RebenchLog
4646
command: &AWFY_CMD "-cp Examples/AreWeFastYet/CD:Examples/AreWeFastYet/Havlak:Examples/AreWeFastYet/Core:Smalltalk Examples/AreWeFastYet/Harness.som --gc %(benchmark)s %(iterations)s "
4747
iterations: 1
4848
invocations: 5
4949
benchmarks:
50-
- CD: {extra_args: 10, machines: [yuria4]}
51-
- Havlak: {extra_args: 15, machines: [yuria4]}
50+
- CD: {extra_args: 10, tags: [yuria4]}
51+
- Havlak: {extra_args: 15, tags: [yuria4]}
5252

5353
awfy-steady:
5454
gauge_adapter: RebenchLog
5555
command: *AWFY_CMD
5656
benchmarks:
57-
- CD: {extra_args: 100, warmup: 30, iterations: 130, machines: [yuria4]}
58-
- Havlak: {extra_args: 150, warmup: 30, iterations: 130, machines: [yuria3]}
57+
- CD: {extra_args: 100, warmup: 30, iterations: 130, tags: [yuria4]}
58+
- Havlak: {extra_args: 150, warmup: 30, iterations: 130, tags: [yuria3]}
5959

6060
micro-startup:
6161
gauge_adapter: RebenchLog
6262
command: &MICRO_CMD "-cp Smalltalk:Examples/Benchmarks/LanguageFeatures:Examples/Benchmarks/TestSuite Examples/Benchmarks/BenchmarkHarness.som --gc %(benchmark)s %(iterations)s "
6363
iterations: 1
6464
invocations: 5
6565
benchmarks:
66-
- Fannkuch: {extra_args: 7, machines: [yuria4]}
67-
- Fibonacci: {extra_args: 10, machines: [yuria2]}
68-
- Dispatch: {extra_args: 10, machines: [yuria3]}
69-
- Bounce: {extra_args: 10, machines: [yuria4]}
70-
- Loop: {extra_args: 100, machines: [yuria2]}
71-
- Permute: {extra_args: 10, machines: [yuria3]}
72-
- Queens: {extra_args: 10, machines: [yuria4]}
73-
- List: {extra_args: 2, machines: [yuria2]}
74-
- Recurse: {extra_args: 12, machines: [yuria3]}
75-
- Storage: {extra_args: 8, machines: [yuria4]}
76-
- Sieve: {extra_args: 20, machines: [yuria2]}
77-
- BubbleSort: {extra_args: 15, machines: [yuria3]}
78-
- QuickSort: {extra_args: 15, machines: [yuria ]}
79-
- Sum: {extra_args: 40, machines: [yuria2]}
80-
- Towers: {extra_args: 2, machines: [yuria3]}
81-
- TreeSort: {extra_args: 7, machines: [yuria ]}
82-
- IntegerLoop: {extra_args: 7, machines: [yuria2]}
83-
- FieldLoop: {extra_args: 1, machines: [yuria3]}
84-
- WhileLoop: {extra_args: 30, machines: [yuria ]}
85-
- Mandelbrot: {extra_args: 50, machines: [yuria2]}
66+
- Fannkuch: {extra_args: 7, tags: [yuria4]}
67+
- Fibonacci: {extra_args: 10, tags: [yuria2]}
68+
- Dispatch: {extra_args: 10, tags: [yuria3]}
69+
- Bounce: {extra_args: 10, tags: [yuria4]}
70+
- Loop: {extra_args: 100, tags: [yuria2]}
71+
- Permute: {extra_args: 10, tags: [yuria3]}
72+
- Queens: {extra_args: 10, tags: [yuria4]}
73+
- List: {extra_args: 2, tags: [yuria2]}
74+
- Recurse: {extra_args: 12, tags: [yuria3]}
75+
- Storage: {extra_args: 8, tags: [yuria4]}
76+
- Sieve: {extra_args: 20, tags: [yuria2]}
77+
- BubbleSort: {extra_args: 15, tags: [yuria3]}
78+
- QuickSort: {extra_args: 15, tags: [yuria ]}
79+
- Sum: {extra_args: 40, tags: [yuria2]}
80+
- Towers: {extra_args: 2, tags: [yuria3]}
81+
- TreeSort: {extra_args: 7, tags: [yuria ]}
82+
- IntegerLoop: {extra_args: 7, tags: [yuria2]}
83+
- FieldLoop: {extra_args: 1, tags: [yuria3]}
84+
- WhileLoop: {extra_args: 30, tags: [yuria ]}
85+
- Mandelbrot: {extra_args: 50, tags: [yuria2]}
8686

87-
- Test: {invocations: 10, machines: [yuria ]}
88-
- TestGC: {invocations: 10, extra_args: 10, machines: [yuria ]}
87+
- Test: {invocations: 10, tags: [yuria ]}
88+
- TestGC: {invocations: 10, extra_args: 10, tags: [yuria ]}
8989

9090
micro-steady:
9191
gauge_adapter: RebenchLog
9292
command: *MICRO_CMD
9393
benchmarks:
94-
- Fannkuch: {extra_args: 9, warmup: 5, iterations: 55, machines: [yuria4]}
95-
- Fibonacci: {extra_args: 1000, warmup: 10, iterations: 60, machines: [yuria4]}
96-
- Dispatch: {extra_args: 10000, warmup: 5, iterations: 55, machines: [yuria4]}
97-
- Bounce: {extra_args: 4000, warmup: 10, iterations: 60, machines: [yuria4]}
98-
- Loop: {extra_args: 10000, warmup: 5, iterations: 55, machines: [yuria2]}
99-
- Permute: {extra_args: 1500, warmup: 5, iterations: 55, machines: [yuria4]}
100-
- Queens: {extra_args: 1000, warmup: 5, iterations: 55, machines: [yuria4]}
101-
- List: {extra_args: 1000, warmup: 15, iterations: 65, machines: [yuria4]}
102-
- Recurse: {extra_args: 2000, warmup: 15, iterations: 65, machines: [yuria4]}
103-
- Storage: {extra_args: 1000, warmup: 10, iterations: 60, machines: [yuria4]}
104-
- Sieve: {extra_args: 2500, warmup: 10, iterations: 60, machines: [yuria2]}
105-
- BubbleSort: {extra_args: 3000, warmup: 5, iterations: 55, machines: [yuria4]}
106-
- QuickSort: {extra_args: 2000, warmup: 5, iterations: 55, machines: [yuria4]}
107-
- Sum: {extra_args: 10000, warmup: 5, iterations: 55, machines: [yuria2]}
108-
- Towers: {extra_args: 1000, warmup: 5, iterations: 55, machines: [yuria4]}
109-
- TreeSort: {extra_args: 1000, warmup: 10, iterations: 60, machines: [yuria4]}
110-
- IntegerLoop: {extra_args: 8000, warmup: 5, iterations: 55, machines: [yuria2]}
111-
- FieldLoop: {extra_args: 900, warmup: 5, iterations: 55, machines: [yuria4]}
112-
- WhileLoop: {extra_args: 9000, warmup: 5, iterations: 55, machines: [yuria2]}
113-
- Mandelbrot: {extra_args: 1000, warmup: 10, iterations: 110, machines: [yuria4]}
94+
- Fannkuch: {extra_args: 9, warmup: 5, iterations: 55, tags: [yuria4]}
95+
- Fibonacci: {extra_args: 1000, warmup: 10, iterations: 60, tags: [yuria4]}
96+
- Dispatch: {extra_args: 10000, warmup: 5, iterations: 55, tags: [yuria4]}
97+
- Bounce: {extra_args: 4000, warmup: 10, iterations: 60, tags: [yuria4]}
98+
- Loop: {extra_args: 10000, warmup: 5, iterations: 55, tags: [yuria2]}
99+
- Permute: {extra_args: 1500, warmup: 5, iterations: 55, tags: [yuria4]}
100+
- Queens: {extra_args: 1000, warmup: 5, iterations: 55, tags: [yuria4]}
101+
- List: {extra_args: 1000, warmup: 15, iterations: 65, tags: [yuria4]}
102+
- Recurse: {extra_args: 2000, warmup: 15, iterations: 65, tags: [yuria4]}
103+
- Storage: {extra_args: 1000, warmup: 10, iterations: 60, tags: [yuria4]}
104+
- Sieve: {extra_args: 2500, warmup: 10, iterations: 60, tags: [yuria2]}
105+
- BubbleSort: {extra_args: 3000, warmup: 5, iterations: 55, tags: [yuria4]}
106+
- QuickSort: {extra_args: 2000, warmup: 5, iterations: 55, tags: [yuria4]}
107+
- Sum: {extra_args: 10000, warmup: 5, iterations: 55, tags: [yuria2]}
108+
- Towers: {extra_args: 1000, warmup: 5, iterations: 55, tags: [yuria4]}
109+
- TreeSort: {extra_args: 1000, warmup: 10, iterations: 60, tags: [yuria4]}
110+
- IntegerLoop: {extra_args: 8000, warmup: 5, iterations: 55, tags: [yuria2]}
111+
- FieldLoop: {extra_args: 900, warmup: 5, iterations: 55, tags: [yuria4]}
112+
- WhileLoop: {extra_args: 9000, warmup: 5, iterations: 55, tags: [yuria2]}
113+
- Mandelbrot: {extra_args: 1000, warmup: 10, iterations: 110, tags: [yuria4]}
114114

115115
micro-somsom:
116116
gauge_adapter: RebenchLog
117117
command: "-cp Smalltalk:Examples/Benchmarks/LanguageFeatures Examples/Benchmarks/BenchmarkHarness.som --gc %(benchmark)s %(iterations)s "
118118
iterations: 1
119119
benchmarks:
120-
- Loop: {extra_args: 1, machines: [yuria4]}
121-
- Queens: {extra_args: 1, machines: [yuria4]}
122-
- List: {extra_args: 1, machines: [yuria2]}
123-
- Recurse: {extra_args: 1, machines: [yuria4]}
124-
- Mandelbrot: {extra_args: 3, machines: [yuria4]}
120+
- Loop: {extra_args: 1, tags: [yuria4]}
121+
- Queens: {extra_args: 1, tags: [yuria4]}
122+
- List: {extra_args: 1, tags: [yuria2]}
123+
- Recurse: {extra_args: 1, tags: [yuria4]}
124+
- Mandelbrot: {extra_args: 3, tags: [yuria4]}
125125

126126
som-parse:
127127
gauge_adapter: RebenchLog
128128
command: "-cp Smalltalk:Examples:Examples/Benchmarks/DeltaBlue:Examples/Benchmarks/GraphSearch:Examples/Benchmarks/Json:Examples/Benchmarks/NBody:TestSuite:core-lib/SomSom/tests:core-lib/SomSom/src/vmobjects:core-lib/SomSom/src/primitives:core-lib/SomSom/src/compiler Examples/Benchmarks/BenchmarkHarness.som --gc %(benchmark)s %(iterations)s "
129129
iterations: 1!
130130
invocations: 10
131131
benchmarks:
132-
- SomParse: {extra_args: 1, machines: [yuria2]}
133-
- SomInit: {extra_args: 10000, machines: [yuria2]}
132+
- SomParse: {extra_args: 1, tags: [yuria2]}
133+
- SomInit: {extra_args: 10000, tags: [yuria2]}
134134

135135
interpreter:
136136
description: Basic interpreter benchmarks for comparing performance of most basic concepts.
137137
gauge_adapter: RebenchLog
138138
invocations: 5
139139
command: "-cp Smalltalk:Examples/Benchmarks/Interpreter Examples/Benchmarks/BenchmarkHarness.som %(benchmark)s %(iterations)s 1"
140140
benchmarks:
141-
- ArgRead: {machines: [yuria ]}
142-
- ArrayReadConst: {machines: [yuria ]}
143-
- ArrayWriteConstConst: {machines: [yuria ]}
144-
- BlockSend0ConstReturn: {machines: [yuria ]}
145-
- Const: {machines: [yuria ]}
146-
- FieldConstWrite: {machines: [yuria ]}
147-
- FieldRead: {machines: [yuria ]}
148-
- FieldReadIncWrite: {machines: [yuria ]}
149-
- FieldReadWrite: {machines: [yuria ]}
150-
- GlobalRead: {machines: [yuria ]}
151-
- LocalConstWrite: {machines: [yuria ]}
152-
- LocalRead: {machines: [yuria ]}
153-
- LocalReadIncWrite: {machines: [yuria ]}
154-
- LocalReadWrite: {machines: [yuria ]}
155-
- SelfSend0: {machines: [yuria ]}
156-
- SelfSend0BlockConstNonLocalReturn: {machines: [yuria ]}
141+
- ArgRead: {tags: [yuria ]}
142+
- ArrayReadConst: {tags: [yuria ]}
143+
- ArrayWriteConstConst: {tags: [yuria ]}
144+
- BlockSend0ConstReturn: {tags: [yuria ]}
145+
- Const: {tags: [yuria ]}
146+
- FieldConstWrite: {tags: [yuria ]}
147+
- FieldRead: {tags: [yuria ]}
148+
- FieldReadIncWrite: {tags: [yuria ]}
149+
- FieldReadWrite: {tags: [yuria ]}
150+
- GlobalRead: {tags: [yuria ]}
151+
- LocalConstWrite: {tags: [yuria ]}
152+
- LocalRead: {tags: [yuria ]}
153+
- LocalReadIncWrite: {tags: [yuria ]}
154+
- LocalReadWrite: {tags: [yuria ]}
155+
- SelfSend0: {tags: [yuria ]}
156+
- SelfSend0BlockConstNonLocalReturn: {tags: [yuria ]}
157157

158158
executors:
159159
TruffleSOM-interp:

0 commit comments

Comments
 (0)