Merge pull request #652 from mikepapadim/feature/bc_dealloc_pretty_print

[loging] Enhance deallocation logging to include materialization of action

Author: jjfumero

tornado-runtime/src/main/java/uk/ac/manchester/tornado/runtime/interpreter/DebugInterpreter.java

@@ -44,12 +44,13 @@ static void logAllocObject(Object object, TornadoXPUDevice interpreterDevice, lo
         appendLogBuilder(verbose, logBuilder);
     }
 
-    static void logDeallocObject(Object object, TornadoXPUDevice interpreterDevice, StringBuilder logBuilder) {
-        String verbose = String.format("bc: %s[0x%x] %s on %s", //
-                InterpreterUtilities.debugHighLightBC("DEALLOC"), //
+    static void logDeallocObject(Object object, TornadoXPUDevice interpreterDevice, StringBuilder logBuilder, boolean materializeDealloc) {
+        String verbose = String.format("bc: %s[0x%x] %s [Status: %s] on %s", //
+                materializeDealloc ? InterpreterUtilities.debugHighLightBC("DEALLOC") : InterpreterUtilities.debugHighLightNonExecBC("DEALLOC"), //
                 object.hashCode(), //
                 object, //
-                InterpreterUtilities.debugDeviceBC(interpreterDevice));
+                InterpreterUtilities.debugHighLightNonExecBC(materializeDealloc ? "Freed" : "Persisted"), //
+                InterpreterUtilities.debugDeviceBC(interpreterDevice)); //
         appendLogBuilder(verbose, logBuilder);
     }
 

tornado-runtime/src/main/java/uk/ac/manchester/tornado/runtime/interpreter/TornadoVMInterpreter.java

@@ -498,13 +498,13 @@ private int executeAlloc(StringBuilder logBuilder, int[] args, long sizeBatch) {
     private int executeDeAlloc(StringBuilder tornadoVMBytecodeList, final int objectIndex) {
         Object object = objects.get(objectIndex);
 
-        if (TornadoOptions.PRINT_BYTECODES && isNotObjectAtomic(object)) {
-            DebugInterpreter.logDeallocObject(object, interpreterDevice, tornadoVMBytecodeList);
-        }
-
         final XPUDeviceBufferState objectState = resolveObjectState(objectIndex);
         long spaceDeallocated = interpreterDevice.deallocate(objectState);
         // Update current device area use
+        if (TornadoOptions.PRINT_BYTECODES && isNotObjectAtomic(object)) {
+            boolean materializeDealloc = spaceDeallocated == 0;
+            DebugInterpreter.logDeallocObject(object, interpreterDevice, tornadoVMBytecodeList, materializeDealloc);
+        }
         graphExecutionContext.setCurrentDeviceMemoryUsage(graphExecutionContext.getCurrentDeviceMemoryUsage() - spaceDeallocated);
         return -1;
     }