RVM-1013, MMTk Harness improvements Jan 2013

Author: robingarner-scu

.hgignore

@@ -32,3 +32,6 @@ syntax:regexp
 ^results
 ^target
 
+
+syntax: regexp
+^test-output$

MMTk/ext/vm/harness/org/mmtk/harness/vm/Collection.java

@@ -21,17 +21,25 @@
 import org.mmtk.plan.MutatorContext;
 
 import org.vmmagic.pragma.*;
+import org.vmmagic.unboxed.harness.Clock;
 
 @Uninterruptible
 public class Collection extends org.mmtk.vm.Collection {
 
+  private static int gcCount = 0;
+
+  public static int getGcCount() {
+    return gcCount;
+  }
+
   @Override
   public void prepareMutator(MutatorContext m) {
     // Nothing to do
   }
 
   @Override
   public void requestMutatorFlush() {
+    Mutator.current().getContext().flush();
     Assert.notImplemented();
   }
 
@@ -51,7 +59,10 @@ public boolean yieldpoint() {
    */
   @Override
   public void blockForGC() {
+    gcCount++;
+    Clock.stop();
     Scheduler.waitForGC();
+    Clock.start();
   }
 
   /**
@@ -76,16 +87,22 @@ public void outOfMemory() {
 
   @Override
   public void spawnCollectorContext(CollectorContext context) {
+    Clock.stop();
     Scheduler.scheduleCollector(context);
+    Clock.start();
   }
 
   @Override
   public void stopAllMutators() {
+    Clock.stop();
     Scheduler.stopAllMutators();
+    Clock.start();
   }
 
   @Override
   public void resumeAllMutators() {
+    Clock.stop();
     Scheduler.resumeAllMutators();
+    Clock.start();
   }
 }

MMTk/ext/vm/harness/org/mmtk/harness/vm/Debug.java

@@ -19,6 +19,7 @@
 import org.mmtk.plan.TraceLocal;
 import org.vmmagic.unboxed.Address;
 import org.vmmagic.unboxed.ObjectReference;
+import org.vmmagic.unboxed.harness.Clock;
 
 /**
  * Debugger support for the MMTk harness
@@ -44,36 +45,67 @@ private String format(Address addr) {
     return ObjectModel.addressAndSpaceString(addr);
   }
 
+  /**
+   * @see org.mmtk.vm.Debug#arrayRemsetEntry(org.vmmagic.unboxed.Address, org.vmmagic.unboxed.Address)
+   */
   @Override
   public void arrayRemsetEntry(Address start, Address guard) {
-    Trace.trace(Item.REMSET, "arrayRemset: [%s,%s)", start, guard);
+    if (Trace.isEnabled(Item.REMSET)) {
+      Clock.stop();
+      Trace.trace(Item.REMSET, "arrayRemset: [%s,%s)", start, guard);
+      Clock.start();
+    }
   }
 
+  /**
+   * @see org.mmtk.vm.Debug#modbufEntry(org.vmmagic.unboxed.ObjectReference)
+   */
   @Override
   public void modbufEntry(ObjectReference object) {
-    Trace.trace(Item.REMSET, "modbuf: %s", format(object));
+    if (Trace.isEnabled(Item.REMSET)) {
+      Clock.stop();
+      Trace.trace(Item.REMSET, "modbuf: %s", format(object));
+      Clock.start();
+    }
   }
 
+  /**
+   * @see org.mmtk.vm.Debug#remsetEntry(org.vmmagic.unboxed.Address)
+   */
   @Override
   public void remsetEntry(Address slot) {
-    try {
-    Trace.trace(Item.REMSET, "remset: %s->%s", format(slot), format(slot.loadObjectReference()));
-    } catch (Throwable e) {
-      System.err.printf("Error encountered processing remset entry %s%n", slot);
-      throw new RuntimeException(e);
+    if (Trace.isEnabled(Item.REMSET)) {
+      Clock.stop();
+      Trace.trace(Item.REMSET, "remset: %s->%s", format(slot), format(slot.loadObjectReference()));
+      Clock.start();
     }
   }
 
+  /**
+   * @see org.mmtk.vm.Debug#globalPhase(short, boolean)
+   */
   @Override
   public void globalPhase(short phaseId, boolean before) {
+    Clock.stop();
     if (phaseId == Simple.RELEASE && before) {
       new FromSpaceInvariant();
     }
+    if (phaseId == Simple.COMPLETE && !before) {
+      Scanning.releaseThreads();
+    }
+    Clock.start();
   }
 
+  /**
+   * @see org.mmtk.vm.Debug#traceObject(org.mmtk.plan.TraceLocal, org.vmmagic.unboxed.ObjectReference)
+   */
   @Override
   public void traceObject(TraceLocal trace, ObjectReference object) {
-    Trace.trace(Item.TRACEOBJECT, "traceObject: %s", format(object));
+    if (Trace.isEnabled(Item.TRACEOBJECT)) {
+      Clock.stop();
+      Trace.trace(Item.TRACEOBJECT, "traceObject: %s", format(object));
+      Clock.start();
+    }
   }
 
   /**
@@ -82,7 +114,11 @@ public void traceObject(TraceLocal trace, ObjectReference object) {
    */
   @Override
   public void queueHeadInsert(String queueName, Address value) {
-    Trace.trace(Item.QUEUE, "head insert %s to %s", value, queueName);
+    if (Trace.isEnabled(Item.QUEUE)) {
+      Clock.stop();
+      Trace.trace(Item.QUEUE, "head insert %s to %s", value, queueName);
+      Clock.start();
+    }
   }
 
   /**
@@ -91,7 +127,11 @@ public void queueHeadInsert(String queueName, Address value) {
    */
   @Override
   public void queueHeadRemove(String queueName, Address value) {
-    Trace.trace(Item.QUEUE, "head remove %s from %s", value, queueName);
+    if (Trace.isEnabled(Item.QUEUE)) {
+      Clock.stop();
+      Trace.trace(Item.QUEUE, "head remove %s from %s", value, queueName);
+      Clock.start();
+    }
   }
 
   /**
@@ -100,7 +140,11 @@ public void queueHeadRemove(String queueName, Address value) {
    */
   @Override
   public void queueTailInsert(String queueName, Address value) {
-    Trace.trace(Item.QUEUE, "tail insert %s to %s", value, queueName);
+    if (Trace.isEnabled(Item.QUEUE)) {
+      Clock.stop();
+      Trace.trace(Item.QUEUE, "tail insert %s to %s", value, queueName);
+      Clock.start();
+    }
   }
 
   /**
@@ -109,8 +153,10 @@ public void queueTailInsert(String queueName, Address value) {
    */
   @Override
   public void queueTailRemove(String queueName, Address value) {
-    Trace.trace(Item.QUEUE, "tail remove %s from %s", value, queueName);
+    if (Trace.isEnabled(Item.QUEUE)) {
+      Clock.stop();
+      Trace.trace(Item.QUEUE, "tail remove %s from %s", value, queueName);
+      Clock.start();
+    }
   }
-
-
 }

MMTk/ext/vm/harness/org/mmtk/harness/vm/Memory.java

@@ -45,7 +45,8 @@ public class Memory extends org.mmtk.vm.Memory {
    * TODO is this comment in the right place?
    */
    private static ImmortalSpace vmSpace = null;
-   private static Extent VMSPACE_SIZE = Extent.fromIntZeroExtend(0x10000000);
+
+   private static final Extent vmSpaceSize = Extent.fromIntZeroExtend(0x10000000);
 
    // Uncomment the below to exercise MMTk's 64-bit address space handling
 
@@ -56,14 +57,14 @@ public class Memory extends org.mmtk.vm.Memory {
 //       Address.fromIntZeroExtend(0xA0000000) :
 //       Address.fromLong(0x2A0000000L);
 
-   public static final Address HEAP_START = Address.fromIntZeroExtend(0x10000000);
-   public static final Address HEAP_END = Address.fromIntZeroExtend(0xA0000000);
+   private static final Address heapStartAddress = Address.fromIntZeroExtend(0x10000000);
+   private static final Address heapEndAddress = Address.fromIntZeroExtend(0x40000000);
 
   @Override
   @Interruptible
   public ImmortalSpace getVMSpace() {
     if (vmSpace == null) {
-      vmSpace = new ImmortalSpace("vm", VMRequest.create(VMSPACE_SIZE, false));
+      vmSpace = new ImmortalSpace("vm", VMRequest.create(getVmspacesize(), false));
     }
     return vmSpace;
   }
@@ -141,13 +142,13 @@ public void isync() {
    * called by MMTk users.
    */
   @Override
-  protected Address getHeapStartConstant() { return HEAP_START; }
+  protected Address getHeapStartConstant() { return getHeapstartaddress(); }
   @Override
-  protected Address getHeapEndConstant() { return HEAP_END; }
+  protected Address getHeapEndConstant() { return getHeapendaddress(); }
   @Override
-  protected Address getAvailableStartConstant() { return HEAP_START.plus(VMSPACE_SIZE); }
+  protected Address getAvailableStartConstant() { return getHeapstartaddress().plus(getVmspacesize()); }
   @Override
-  protected Address getAvailableEndConstant()  { return HEAP_END; }
+  protected Address getAvailableEndConstant()  { return getHeapendaddress(); }
   @Override
   protected byte getLogBytesInAddressConstant() { return (byte) MemoryConstants.LOG_BYTES_IN_WORD; }
   @Override
@@ -162,4 +163,25 @@ public void isync() {
   protected int getMaxBytesPaddingConstant() { return MemoryConstants.BYTES_IN_WORD; }
   @Override
   protected int getAlignmentValueConstant() { return ObjectModel.ALIGNMENT_VALUE; }
+
+  /**
+   * @return the vmspacesize
+   */
+  public static Extent getVmspacesize() {
+    return vmSpaceSize;
+  }
+
+  /**
+   * @return the heapstartaddress
+   */
+  public static Address getHeapstartaddress() {
+    return heapStartAddress;
+  }
+
+  /**
+   * @return the heapendaddress
+   */
+  public static Address getHeapendaddress() {
+    return heapEndAddress;
+  }
 }