Support primitiveDoMixedArithmetic

hpi-swa · Nov 7, 2024 · 21cd9ed · 21cd9ed · TruffleSqueak-Bot · Nov 7, 2024
1 parent 08801f0
commit 21cd9ed
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 63 deletions.
diff --git a/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/image/SqueakImageFlags.java b/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/image/SqueakImageFlags.java
@@ -8,6 +8,7 @@
 
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
+import com.oracle.truffle.api.dsl.Idempotent;
 
 public final class SqueakImageFlags {
     private static final int PRIMITIVE_DO_MIXED_ARITHMETIC = 0x100;
@@ -21,7 +22,7 @@ public void initialize(final long oldBaseAddressValue, final long flags, final l
         CompilerDirectives.transferToInterpreterAndInvalidate();
         oldBaseAddress = oldBaseAddressValue;
         // TruffleSqueak only supports mixed arithmetics, unset bit to ensure flag is always true
-        headerFlags = flags & ~PRIMITIVE_DO_MIXED_ARITHMETIC;
+        headerFlags = flags; // & ~PRIMITIVE_DO_MIXED_ARITHMETIC;
         snapshotScreenSize = screenSize;
         maxExternalSemaphoreTableSize = lastMaxExternalSemaphoreTableSize;
     }
@@ -55,4 +56,9 @@ public int getSnapshotScreenHeight() {
     public int getMaxExternalSemaphoreTableSize() {
         return maxExternalSemaphoreTableSize;
     }
+
+    @Idempotent
+    public boolean isPrimitiveDoMixedArithmetic() {
+        return (headerFlags & PRIMITIVE_DO_MIXED_ARITHMETIC) == 0;
+    }
 }
diff --git a/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/AbstractNode.java b/src/de.hpi.swa.trufflesqueak/src/de/hpi/swa/trufflesqueak/nodes/AbstractNode.java
@@ -6,6 +6,7 @@
  */
 package de.hpi.swa.trufflesqueak.nodes;
 
+import com.oracle.truffle.api.dsl.Idempotent;
 import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.TypeSystemReference;
 import com.oracle.truffle.api.nodes.Node;
@@ -49,7 +50,13 @@ protected final boolean isPoint(final PointersObject object) {
         return getContext().isPointClass(object.getSqueakClass());
     }
 
+    @Idempotent
+    protected final boolean isPrimitiveDoMixedArithmetic() {
+        return getContext().flags.isPrimitiveDoMixedArithmetic();
+    }
+
     protected final boolean isSemaphore(final PointersObject object) {
         return getContext().isSemaphoreClass(object.getSqueakClass());
     }
+
 }
Benchmark Name	Min	Geomean	Median	Mean	Max	Total (ms)	Total (min)
Bounce	511	528	515.41	512	515.38	103081	1.72
CD	474	498	480	476	479.94	96000	1.6
DeltaBlue	270	438	392.59	393.5	391.49	78518	1.31
Havlak	1113	1171	1143.03	1143	1142.99	228606	3.81
Json	341	358	344.47	342	344.43	68894	1.15
List	311	339	313.64	312	313.59	62727	1.05
Mandelbrot	129	146	130.53	130	130.5	26105	0.44
NBody	247	273	259.79	258	259.75	51958	0.87
Permute	155	171	156.18	155	156.15	31235	0.52
Queens	220	247	222.34	221	222.28	44468	0.74
Richards	1310	1335	1315.45	1312	1315.44	263089	4.38
Sieve	177	200	178.38	178	178.35	35676	0.59
Storage	141	159	143.9	142	143.83	28779	0.48
Towers	179	210	181.67	180	181.6	36333	0.61
	5578	6073	5777.35	5754.5	5775.71	1155469	19.26