7903411: JOL: Rework Model64 to include comp ref/class attributes

Author: shipilev

jol-cli/src/main/java/org/openjdk/jol/operations/EstimatedModels.java

@@ -31,14 +31,14 @@ public class EstimatedModels {
 
     static final DataModel[] MODELS_JDK8 = new DataModel[]{
             new Model32(),
-            new Model64(),
-            new Model64_COOPS_CCPS(),
-            new Model64_COOPS_CCPS(16),
+            new Model64(false, false),
+            new Model64(true, true),
+            new Model64(true, true, 16),
     };
 
     static final DataModel[] MODELS_JDK15 = new DataModel[]{
-            new Model64_CCPS(),
-            new Model64_CCPS(16),
+            new Model64(false, true),
+            new Model64(false, true, 16),
     };
 
     static final DataModel[] MODELS_LILLIPUT = new DataModel[]{

jol-cli/src/main/java/org/openjdk/jol/operations/StringCompress.java

@@ -60,11 +60,11 @@ public class StringCompress implements Operation {
 
     static final DataModel[] DATA_MODELS = new DataModel[]{
             new Model32(),
-            new Model64(),
-            new Model64_COOPS_CCPS(),
-            new Model64_COOPS_CCPS(16),
-            new Model64_CCPS(),
-            new Model64_CCPS(16),
+            new Model64(false, false),
+            new Model64(true, true),
+            new Model64(true, true, 16),
+            new Model64(false, true),
+            new Model64(false, true, 16),
     };
 
 

jol-core/src/main/java/org/openjdk/jol/datamodel/Model64.java

@@ -27,20 +27,24 @@
 import java.util.Objects;
 
 /**
- * 64 bits model, no compressed references, no compressed class pointers.
+ * 64 bits model.
  *
  * @author Aleksey Shipilev
  */
 public class Model64 implements DataModel {
 
     private final int align;
+    private final boolean compRefs;
+    private final boolean compKlass;
 
-    public Model64() {
-        this(8);
+    public Model64(boolean compressedRefs, boolean compressedClasses, int align) {
+        this.compRefs = compressedRefs;
+        this.compKlass = compressedClasses;
+        this.align = align;
     }
 
-    public Model64(int align) {
-        this.align = align;
+    public Model64(boolean compressedRefs, boolean compressedClasses) {
+        this(compressedRefs, compressedClasses, 8);
     }
 
     @Override
@@ -50,7 +54,7 @@ public int markHeaderSize() {
 
     @Override
     public int classHeaderSize() {
-        return 8;
+        return compKlass ? 4 : 8;
     }
 
     @Override
@@ -84,7 +88,7 @@ public int sizeOf(String klass) {
             case "double":
                 return 8;
             default:
-                return 8;
+                return (compRefs ? 4 : 8);
         }
     }
 
@@ -95,7 +99,10 @@ public int objectAlignment() {
 
     @Override
     public String toString() {
-        return "64-bit model, " + align + "-byte aligned";
+        return "64-bit model" +
+                ", " + (compRefs ? "" : "NO ") + "compressed references" +
+                ", " + (compKlass ? "" : "NO ") + "compressed classes" +
+                ", " + align + "-byte aligned";
     }
 
     @Override

jol-core/src/main/java/org/openjdk/jol/datamodel/Model64_CCPS.java

@@ -16,9 +16,9 @@ public class LayouterInvariantsTest {
     private static final DataModel[] MODELS = {
             new ModelVM(),
             new Model32(),
-            new Model64(),
-            new Model64_CCPS(),
-            new Model64_COOPS_CCPS(),
+            new Model64(false, false, 8),
+            new Model64(false, true, 8),
+            new Model64(true, true, 8),
     };
 
     private static final int ITERATIONS = 10000;

jol-core/src/main/java/org/openjdk/jol/datamodel/Model64_COOPS_CCPS.java

@@ -70,14 +70,14 @@ public class JOLSample_10_DataModels {
 
     private static final DataModel[] MODELS_JDK8 = new DataModel[]{
             new Model32(),
-            new Model64(),
-            new Model64_COOPS_CCPS(),
-            new Model64_COOPS_CCPS(16),
+            new Model64(false, false),
+            new Model64(true, true),
+            new Model64(true, true, 16),
     };
 
     private static final DataModel[] MODELS_JDK15 = new DataModel[]{
-            new Model64_CCPS(),
-            new Model64_CCPS(16),
+            new Model64(false, true),
+            new Model64(false, true, 16),
     };
 
     public static void main(String[] args) {