Skip to content

Commit 0e160c3

Browse files
k-sareenk-sareen
authored
Add Compressor tests (#310)
1 parent cf7879f commit 0e160c3

File tree

7 files changed

+64
-7
lines changed

7 files changed

+64
-7
lines changed

‎.github/configs/base.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,9 @@ modifiers:
7474
preserve:
7575
type: ProgramArg
7676
val: "-preserve"
77+
no_compressed_oops:
78+
type: JVMArg
79+
val: "-XX:-UseCompressedOops -XX:-UseCompressedClassPointers"
7780

7881
plugins:
7982
keep_stdout_stderr:
@@ -96,6 +99,9 @@ configs:
9699
- "jdk11-master|ms|s|fail_on_oom|tph|preserve|mmtk_gc-StickyImmix"
97100
- "jdk11-master|ms|s|fail_on_oom|tph|preserve|mmtk_gc-MarkSweep"
98101
- "jdk11-master|ms|s|fail_on_oom|tph|preserve|mmtk_gc-MarkCompact"
102+
# TODO: We need to disable compressed oops for Compressor temporarily until it supports
103+
# discontiguous spaces.
104+
- "jdk11-master|ms|s|fail_on_oom|tph|preserve|no_compressed_oops|mmtk_gc-Compressor"
99105

100106
benchmarks:
101107
dacapo-23.9-RC3-chopin-ci:

‎.github/scripts/ci-expected-results.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ results:
99
StickyImmix: pass
1010
MarkSweep: pass
1111
MarkCompact: pass
12+
Compressor: pass
1213
batik:
1314
SemiSpace: pass
1415
GenCopy: pass
@@ -17,6 +18,7 @@ results:
1718
StickyImmix: pass
1819
MarkSweep: pass
1920
MarkCompact: pass
21+
Compressor: pass
2022
biojava:
2123
SemiSpace: pass
2224
GenCopy: pass
@@ -25,6 +27,7 @@ results:
2527
StickyImmix: pass
2628
MarkSweep: pass
2729
MarkCompact: pass
30+
Compressor: pass
2831
cassandra:
2932
SemiSpace: pass
3033
GenCopy: pass
@@ -33,6 +36,7 @@ results:
3336
StickyImmix: pass
3437
MarkSweep: ignore
3538
MarkCompact: ignore
39+
Compressor: ignore
3640
eclipse:
3741
SemiSpace: pass
3842
GenCopy: pass
@@ -41,6 +45,7 @@ results:
4145
StickyImmix: pass
4246
MarkSweep: ignore
4347
MarkCompact: pass
48+
Compressor: pass
4449
fop:
4550
SemiSpace: pass
4651
GenCopy: pass
@@ -49,6 +54,7 @@ results:
4954
StickyImmix: pass
5055
MarkSweep: ignore
5156
MarkCompact: pass
57+
Compressor: pass
5258
graphchi:
5359
SemiSpace: pass
5460
GenCopy: pass
@@ -57,6 +63,7 @@ results:
5763
StickyImmix: pass
5864
MarkSweep: pass
5965
MarkCompact: pass
66+
Compressor: pass
6067
h2:
6168
SemiSpace: pass
6269
GenCopy: pass
@@ -65,6 +72,7 @@ results:
6572
StickyImmix: pass
6673
MarkSweep: ignore
6774
MarkCompact: pass
75+
Compressor: pass
6876
h2o:
6977
SemiSpace: pass
7078
GenCopy: pass
@@ -73,6 +81,7 @@ results:
7381
StickyImmix: pass
7482
MarkSweep: pass
7583
MarkCompact: pass
84+
Compressor: pass
7685
jme:
7786
SemiSpace: pass
7887
GenCopy: pass
@@ -81,6 +90,7 @@ results:
8190
StickyImmix: pass
8291
MarkSweep: pass
8392
MarkCompact: pass
93+
Compressor: pass
8494
jython:
8595
SemiSpace: pass
8696
GenCopy: pass
@@ -89,6 +99,7 @@ results:
8999
StickyImmix: pass
90100
MarkSweep: ignore
91101
MarkCompact: pass
102+
Compressor: pass
92103
kafka:
93104
SemiSpace: pass
94105
GenCopy: pass
@@ -97,6 +108,7 @@ results:
97108
StickyImmix: pass
98109
MarkSweep: pass
99110
MarkCompact: ignore
111+
Compressor: pass
100112
luindex:
101113
SemiSpace: pass
102114
GenCopy: pass
@@ -105,6 +117,7 @@ results:
105117
StickyImmix: pass
106118
MarkSweep: pass
107119
MarkCompact: pass
120+
Compressor: pass
108121
lusearch:
109122
SemiSpace: pass
110123
GenCopy: pass
@@ -113,6 +126,7 @@ results:
113126
StickyImmix: pass
114127
MarkSweep: pass
115128
MarkCompact: pass
129+
Compressor: pass
116130
pmd:
117131
SemiSpace: pass
118132
GenCopy: pass
@@ -121,6 +135,7 @@ results:
121135
StickyImmix: pass
122136
MarkSweep: pass
123137
MarkCompact: pass
138+
Compressor: pass
124139
sunflow:
125140
SemiSpace: pass
126141
GenCopy: pass
@@ -129,6 +144,7 @@ results:
129144
StickyImmix: pass
130145
MarkSweep: pass
131146
MarkCompact: pass
147+
Compressor: pass
132148
tomcat:
133149
SemiSpace: pass
134150
GenCopy: pass
@@ -137,6 +153,7 @@ results:
137153
StickyImmix: pass
138154
MarkSweep: pass
139155
MarkCompact: pass
156+
Compressor: pass
140157
xalan:
141158
SemiSpace: pass
142159
GenCopy: pass
@@ -145,6 +162,7 @@ results:
145162
StickyImmix: ignore
146163
MarkSweep: pass
147164
MarkCompact: pass
165+
Compressor: pass
148166
zxing:
149167
SemiSpace: pass
150168
GenCopy: pass
@@ -153,6 +171,7 @@ results:
153171
StickyImmix: pass
154172
MarkSweep: pass
155173
MarkCompact: pass
174+
Compressor: pass
156175

157176
release:
158177
avrora:
@@ -163,6 +182,7 @@ results:
163182
StickyImmix: pass
164183
MarkSweep: pass
165184
MarkCompact: pass
185+
Compressor: pass
166186
batik:
167187
SemiSpace: pass
168188
GenCopy: pass
@@ -171,6 +191,7 @@ results:
171191
StickyImmix: pass
172192
MarkSweep: pass
173193
MarkCompact: pass
194+
Compressor: pass
174195
biojava:
175196
SemiSpace: pass
176197
GenCopy: pass
@@ -179,6 +200,7 @@ results:
179200
StickyImmix: pass
180201
MarkSweep: pass
181202
MarkCompact: pass
203+
Compressor: pass
182204
cassandra:
183205
SemiSpace: pass
184206
GenCopy: pass
@@ -187,6 +209,7 @@ results:
187209
StickyImmix: pass
188210
MarkSweep: ignore
189211
MarkCompact: pass
212+
Compressor: pass
190213
eclipse:
191214
SemiSpace: pass
192215
GenCopy: pass
@@ -195,6 +218,7 @@ results:
195218
StickyImmix: pass
196219
MarkSweep: ignore
197220
MarkCompact: pass
221+
Compressor: pass
198222
fop:
199223
SemiSpace: pass
200224
GenCopy: pass
@@ -203,6 +227,7 @@ results:
203227
StickyImmix: pass
204228
MarkSweep: ignore
205229
MarkCompact: pass
230+
Compressor: pass
206231
graphchi:
207232
SemiSpace: pass
208233
GenCopy: pass
@@ -211,6 +236,7 @@ results:
211236
StickyImmix: pass
212237
MarkSweep: pass
213238
MarkCompact: pass
239+
Compressor: pass
214240
h2:
215241
SemiSpace: pass
216242
GenCopy: pass
@@ -219,6 +245,7 @@ results:
219245
StickyImmix: pass
220246
MarkSweep: ignore
221247
MarkCompact: pass
248+
Compressor: pass
222249
h2o:
223250
SemiSpace: pass
224251
GenCopy: pass
@@ -227,6 +254,7 @@ results:
227254
StickyImmix: pass
228255
MarkSweep: ignore
229256
MarkCompact: pass
257+
Compressor: pass
230258
jme:
231259
SemiSpace: pass
232260
GenCopy: pass
@@ -235,6 +263,7 @@ results:
235263
StickyImmix: pass
236264
MarkSweep: pass
237265
MarkCompact: pass
266+
Compressor: pass
238267
jython:
239268
SemiSpace: pass
240269
GenCopy: pass
@@ -243,6 +272,7 @@ results:
243272
StickyImmix: pass
244273
MarkSweep: ignore
245274
MarkCompact: pass
275+
Compressor: pass
246276
kafka:
247277
SemiSpace: pass
248278
GenCopy: pass
@@ -251,6 +281,7 @@ results:
251281
StickyImmix: pass
252282
MarkSweep: pass
253283
MarkCompact: pass
284+
Compressor: pass
254285
luindex:
255286
SemiSpace: pass
256287
GenCopy: pass
@@ -259,6 +290,7 @@ results:
259290
StickyImmix: pass
260291
MarkSweep: pass
261292
MarkCompact: pass
293+
Compressor: pass
262294
lusearch:
263295
SemiSpace: pass
264296
GenCopy: pass
@@ -267,6 +299,7 @@ results:
267299
StickyImmix: pass
268300
MarkSweep: pass
269301
MarkCompact: pass
302+
Compressor: pass
270303
pmd:
271304
SemiSpace: pass
272305
GenCopy: pass
@@ -275,6 +308,7 @@ results:
275308
StickyImmix: pass
276309
MarkSweep: pass
277310
MarkCompact: pass
311+
Compressor: pass
278312
sunflow:
279313
SemiSpace: pass
280314
GenCopy: pass
@@ -283,6 +317,7 @@ results:
283317
StickyImmix: pass
284318
MarkSweep: pass
285319
MarkCompact: pass
320+
Compressor: pass
286321
tomcat:
287322
SemiSpace: pass
288323
GenCopy: pass
@@ -291,6 +326,7 @@ results:
291326
StickyImmix: pass
292327
MarkSweep: pass
293328
MarkCompact: pass
329+
Compressor: pass
294330
xalan:
295331
SemiSpace: ignore
296332
GenCopy: ignore
@@ -299,6 +335,7 @@ results:
299335
StickyImmix: pass
300336
MarkSweep: pass
301337
MarkCompact: pass
338+
Compressor: pass
302339
zxing:
303340
SemiSpace: pass
304341
GenCopy: pass
@@ -307,3 +344,4 @@ results:
307344
StickyImmix: pass
308345
MarkSweep: pass
309346
MarkCompact: pass
347+
Compressor: pass

‎.github/scripts/ci-test-minimal.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ MMTK_PLAN=GenImmix runbms_dacapo2006_with_heap_multiplier fop 4
2323
MMTK_PLAN=StickyImmix runbms_dacapo2006_with_heap_multiplier fop 4
2424
MMTK_PLAN=GenCopy runbms_dacapo2006_with_heap_multiplier fop 4
2525
MMTK_PLAN=MarkCompact runbms_dacapo2006_with_heap_multiplier fop 4
26+
# TODO: Need to temporarily disable compressed oops for the Compressor until it supports
27+
# discontiguous spaces.
28+
MMTK_PLAN=Compressor runbms_dacapo2006_with_heap_multiplier fop 4 -XX:-UseCompressedOops -XX:-UseCompressedClassPointers
2629
MMTK_PLAN=MarkSweep runbms_dacapo2006_with_heap_multiplier fop 8
2730
MMTK_PLAN=NoGC runbms_dacapo2006_with_heap_size fop 1000 1000
2831
# Test heap resizing

‎.github/scripts/ci-test-vo-bit.sh

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ unset JAVA_TOOL_OPTIONS
66

77
run_subset() {
88
heap_multiplier=$1
9+
jvm_options=$2
910

10-
runbms_dacapo2006_with_heap_multiplier antlr $heap_multiplier
11-
runbms_dacapo2006_with_heap_multiplier fop $heap_multiplier
12-
runbms_dacapo2006_with_heap_multiplier luindex $heap_multiplier
11+
runbms_dacapo2006_with_heap_multiplier antlr $heap_multiplier $jvm_options
12+
runbms_dacapo2006_with_heap_multiplier fop $heap_multiplier $jvm_options
13+
runbms_dacapo2006_with_heap_multiplier luindex $heap_multiplier $jvm_options
1314
}
1415

1516
# --- SemiSpace ---
@@ -42,6 +43,13 @@ export MMTK_PLAN=MarkSweep
4243

4344
run_subset 8
4445

46+
# --- Compressor ---
47+
export MMTK_PLAN=Compressor
48+
49+
# TODO: Need to temporarily disable compressed oops for the Compressor until it
50+
# supports discontiguous spaces.
51+
run_subset 4 "-XX:-UseCompressedOops -XX:-UseCompressedClassPointers"
52+
4553
# --- NoGC ---
4654

4755
export MMTK_PLAN=NoGC

‎.github/workflows/run-dacapo-chopin.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,9 @@ jobs:
8484
- name: Check free space and runner log path
8585
run: |
8686
df -h
87-
df /home/runner/runners
87+
df . -h
88+
# FIXME: Commenting because GitHub has changed location the home directory
89+
# df /home/runner/runners
8890
- name: Fetch ${{ env.DACAPO_VERSION }} cache
8991
id: fetch-cache
9092
uses: actions/cache@v3

‎mmtk/Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎mmtk/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ probe = "0.5"
3535
# - change branch
3636
# - change repo name
3737
# But other changes including adding/removing whitespaces in commented lines may break the CI.
38-
mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "c5ead72a87bcc8cc49b5e7a62cf71d848b4b4c9b" }
38+
mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "d93262b4397df4866a64a1d268689ae20f208713" }
3939
# Uncomment the following to build locally
4040
# mmtk = { path = "../repos/mmtk-core" }
4141

0 commit comments

Comments
 (0)