Adjust for testing

hpi-swa · Aug 22, 2022 · 90236d4 · 90236d4 · TruffleSqueak-Bot · Aug 22, 2022
1 parent e1df9b2
commit 90236d4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/image/SqueakImageContext.java b/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/image/SqueakImageContext.java
@@ -391,13 +391,18 @@ public boolean toggleCurrentMarkingFlag() {
     }
 
     public void setHiddenRoots(final ArrayObject theHiddenRoots) {
-        assert hiddenRoots == null && theHiddenRoots.isObjectType();
+        assert hiddenRoots == null && (theHiddenRoots.isObjectType() || isTesting());
         hiddenRoots = theHiddenRoots;
         assert validClassTableRootPages();
     }
 
     /* SpurMemoryManager>>#validClassTableRootPages */
     public boolean validClassTableRootPages() {
+        if (!hiddenRoots.isObjectType()) {
+            assert isTesting(); // Ignore dummy images for testing
+            return true;
+        }
+
         final Object[] hiddenRootsObjects = hiddenRoots.getObjectStorage();
         if (hiddenRootsObjects.length != SqueakImageConstants.CLASS_TABLE_ROOT_SLOTS + SqueakImageConstants.HIDDEN_ROOT_SLOTS) {
             return false;

diff --git a/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/image/SqueakImageReader.java b/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/image/SqueakImageReader.java
@@ -439,7 +439,7 @@ private void fillInObjects() {
                 if (obj.needsSqueakClass()) {
                     obj.setSqueakClass(chunk.getSqueakClass());
                 }
-                if (!(obj instanceof ClassObject) && obj.needsSqueakHash()) {
+                if (obj.getSqueakHash() != chunk.getHash()) {
                     obj.setSqueakHash(chunk.getHash());
                 }
                 obj.fillin(chunk);
Benchmark Name	Min	Geomean	Median	Mean	Max	Total (ms)	Total (min)
Bounce	182	188	183.99	184	183.98	36797	0.61
CD	968	982	972.27	972	972.27	194454	3.24
DeltaBlue	216	359	320.3	328	318.97	64060	1.07
Havlak	1427	1519	1477.07	1476.5	1476.88	295414	4.92
Json	854	864	857.83	858	857.82	171565	2.86
List	890	901	892.11	891	892.11	178422	2.97
Mandelbrot	144	153	145.24	145	145.24	29048	0.48
NBody	274	284	277.04	277	277.03	55407	0.92
Permute	226	251	230.53	227	230.47	46106	0.77
Queens	250	261	251.93	252	251.92	50385	0.84
Richards	1074	1082	1076.41	1076	1076.41	215282	3.59
Sieve	208	214	209.31	209	209.3	41861	0.7
Storage	264	271	266.58	267	266.57	53316	0.89
Towers	336	345	337.33	337	337.32	67465	1.12
	7313	7674	7497.91	7499.5	7496.28	1499582	24.99