Merge 4ffadd0 into 7d373fb

smarr · Apr 18, 2020 · 96fab0e · 96fab0e
2 parents 7d373fb + 4ffadd0
commit 96fab0e
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 9 deletions.
diff --git a/core-lib/Benchmarks/Savina.ns b/core-lib/Benchmarks/Savina.ns
@@ -62,6 +62,24 @@ class Savina usingPlatform: platform andHarness: harness = Value (
     )
   )
 
+  (** Used as baseline to determine the size of the benchmarks **)
+  public class Empty = Benchmark <: Value (
+  )(
+    public benchmark = (
+      | completionPP |
+      completionPP:: actors createPromisePair.
+      completionPP resolver resolve: 0.
+      ^ completionPP promise
+    )
+
+    public verifyResult: result = (
+      ^ true
+    )
+  ) : (
+    public newInstance: problemSize = ( ^ self new )
+    public setupVerifiedRun: run = ( run problemSize: 1 )
+  )
+
   (* === Savina Microbenchmarks === *)
 
   public class PingPong new: numPings = Benchmark <: Value (

diff --git a/libs/black-diamonds b/libs/black-diamonds
diff --git a/src/som/interpreter/nodes/specialized/AndMessageNode.java b/src/som/interpreter/nodes/specialized/AndMessageNode.java
@@ -24,8 +24,9 @@
 
 
 @GenerateNodeFactory
-@Primitive(selector = "and:", noWrapper = true, specializer = AndOrSplzr.class)
-@Primitive(selector = "&&", noWrapper = true, specializer = AndOrSplzr.class)
+@Primitive(selector = "and:", noWrapper = true, specializer = AndOrSplzr.class,
+    disabled = true)
+@Primitive(selector = "&&", noWrapper = true, specializer = AndOrSplzr.class, disabled = true)
 public abstract class AndMessageNode extends BinaryComplexOperation {
   public static class AndOrSplzr extends Specializer<VM, ExpressionNode, SSymbol> {
     protected final NodeFactory<ExpressionNode> boolFact;

diff --git a/src/som/interpreter/nodes/specialized/BooleanInlinedLiteralNode.java b/src/som/interpreter/nodes/specialized/BooleanInlinedLiteralNode.java
@@ -61,8 +61,8 @@ protected final boolean evaluateArgument(final VirtualFrame frame) {
     }
   }
 
-  @Inline(selector = "and:", inlineableArgIdx = 1)
-  @Inline(selector = "&&", inlineableArgIdx = 1)
+  @Inline(selector = "and:", inlineableArgIdx = 1, disabled = true)
+  @Inline(selector = "&&", inlineableArgIdx = 1, disabled = true)
   public static final class AndInlinedLiteralNode extends BooleanInlinedLiteralNode {
 
     public AndInlinedLiteralNode(final ExpressionNode receiverNode,
@@ -85,8 +85,8 @@ public boolean executeBoolean(final VirtualFrame frame) {
     }
   }
 
-  @Inline(selector = "or:", inlineableArgIdx = 1)
-  @Inline(selector = "||", inlineableArgIdx = 1)
+  @Inline(selector = "or:", inlineableArgIdx = 1, disabled = true)
+  @Inline(selector = "||", inlineableArgIdx = 1, disabled = true)
   public static final class OrInlinedLiteralNode extends BooleanInlinedLiteralNode {
 
     public OrInlinedLiteralNode(final ExpressionNode receiverNode,

diff --git a/src/som/interpreter/nodes/specialized/OrMessageNode.java b/src/som/interpreter/nodes/specialized/OrMessageNode.java
@@ -19,8 +19,8 @@
 
 
 @GenerateNodeFactory
-@Primitive(selector = "or:", noWrapper = true, specializer = OrSplzr.class)
-@Primitive(selector = "||", noWrapper = true, specializer = OrSplzr.class)
+@Primitive(selector = "or:", noWrapper = true, specializer = OrSplzr.class, disabled = true)
+@Primitive(selector = "||", noWrapper = true, specializer = OrSplzr.class, disabled = true)
 public abstract class OrMessageNode extends BinaryComplexOperation {
   public static final class OrSplzr extends AndOrSplzr {
     @SuppressWarnings({"unchecked", "rawtypes"})

diff --git a/src/tools/dym/MetricsCsvWriter.java b/src/tools/dym/MetricsCsvWriter.java
@@ -220,6 +220,8 @@ private String typeCategory(final String typeName) {
       case "Symbol":
         return "Symbol"; // TODO: keep this?
       case "Array":
+      case "ValueArray":
+      case "TransferArray":
         return "arr";
       case "True":
       case "False":