< prev index next >

src/hotspot/share/oops/markWord.hpp

Print this page
@@ -23,14 +23,16 @@
   */
  
  #ifndef SHARE_OOPS_MARKWORD_HPP
  #define SHARE_OOPS_MARKWORD_HPP
  
+ #include "layoutKind.hpp"
  #include "metaprogramming/primitiveConversions.hpp"
  #include "oops/compressedKlass.hpp"
  #include "oops/oopsHierarchy.hpp"
  #include "runtime/globals.hpp"
+ #include "utilities/vmEnums.hpp"
  
  #include <type_traits>
  
  // The markWord describes the header of an object.
  //

@@ -40,15 +42,15 @@
  //  --------
  //             hash:25 ------------>| age:4  self-fwd:1  lock:2 (normal object)
  //
  //  64 bits:
  //  --------
- //  unused:22 hash:31 -->| unused_gap:4  age:4  self-fwd:1  lock:2 (normal object)
+ //  unused:22 hash:31 -->| valhalla:4  age:4  self-fwd:1  lock:2 (normal object)
  //
  //  64 bits (with compact headers):
  //  -------------------------------
- //  klass:22  hash:31 -->| unused_gap:4  age:4  self-fwd:1  lock:2 (normal object)
+ //  klass:22  hash:31 -->| valhalla:4  age:4  self-fwd:1  lock:2 (normal object)
  //
  //  - hash contains the identity hash value: largest value is
  //    31 bits, see os::random().  Also, 64-bit vm's require
  //    a hash value no bigger than 32 bits because they will not
  //    properly generate a mask larger than that: see library_call.cpp

@@ -63,13 +65,32 @@
  //    [ptr             | 11]  marked             used to mark an object
  //    [0 ............ 0| 00]  inflating          inflation in progress (stack-locking in use)
  //
  //    We assume that stack/thread pointers have the lowest two bits cleared.
  //
+ //
  //  - INFLATING() is a distinguished markword value of all zeros that is
  //    used when inflating an existing stack-lock into an ObjectMonitor.
  //    See below for is_being_inflated() and INFLATING().
+ //
+ //  VALHALLA EXTENSIONS:
+ //
+ //  N.B.: 32 bit mode is not supported, this section assumes 64 bit systems.
+ //
+ //  Project Valhalla uses markWord bits to denote the following oops (listed least to most significant):
+ //  * inline types: have alternative bytecode behavior, e.g. can not be locked
+ //  * flat arrays: load/decode of klass layout helper is expensive for aaload
+ //  * "null free" arrays: load/decode of klass layout helper again for aaload
+ //  * inline type: "larval state": mutable state, but only during object init, observable
+ //      by only by a single thread (generally do not mutate markWord)
+ //
+ //  Inline types cannot be locked, monitored or inflating.
+ //
+ //  Note the position of 'self-fwd' is not by accident. When forwarding an
+ //  object to a new heap position, HeapWord alignment guarantees the lower
+ //  bits, including 'self-fwd' are 0. "is_self_forwarded()" will be correctly
+ //  set to false. Otherwise encode_pointer_as_mark() may have 'self-fwd' set.
  
  class BasicLock;
  class ObjectMonitor;
  class JavaThread;
  class outputStream;

@@ -104,29 +125,51 @@
    }
  
    // Conversion
    uintptr_t value() const { return _value; }
  
-   // Constants
-   static const int age_bits                       = 4;
+   // Constants, in least significant bit order
    static const int lock_bits                      = 2;
    static const int self_fwd_bits                  = 1;
-   static const int max_hash_bits                  = BitsPerWord - age_bits - lock_bits - self_fwd_bits;
+   // instance state
+   static const int age_bits                       = 4;
+   // EnableValhalla: static prototype header bits (fast path instead of klass layout_helper)
+   static const int inline_type_bits               = 1;
+   static const int null_free_array_bits           = LP64_ONLY(1) NOT_LP64(0);
+   static const int flat_array_bits                = LP64_ONLY(1) NOT_LP64(0);
+   static const int larval_bits                    = 1;
+   static const int max_hash_bits                  = BitsPerWord - age_bits - lock_bits - inline_type_bits - larval_bits - flat_array_bits - null_free_array_bits - self_fwd_bits;
    static const int hash_bits                      = max_hash_bits > 31 ? 31 : max_hash_bits;
-   static const int unused_gap_bits                = LP64_ONLY(4) NOT_LP64(0); // Reserved for Valhalla.
  
    static const int lock_shift                     = 0;
    static const int self_fwd_shift                 = lock_shift + lock_bits;
    static const int age_shift                      = self_fwd_shift + self_fwd_bits;
-   static const int hash_shift                     = age_shift + age_bits + unused_gap_bits;
+   static const int inline_type_shift              = age_shift + age_bits;
+   static const int null_free_array_shift          = inline_type_shift + inline_type_bits;
+   static const int flat_array_shift               = null_free_array_shift + null_free_array_bits;
+   static const int larval_shift                   = flat_array_shift + flat_array_bits;
+   static const int hash_shift                     = larval_shift + larval_bits;
  
    static const uintptr_t lock_mask                = right_n_bits(lock_bits);
    static const uintptr_t lock_mask_in_place       = lock_mask << lock_shift;
    static const uintptr_t self_fwd_mask            = right_n_bits(self_fwd_bits);
    static const uintptr_t self_fwd_mask_in_place   = self_fwd_mask << self_fwd_shift;
+   static const uintptr_t inline_type_bit_in_place = right_n_bits(inline_type_bits) << inline_type_shift;
+   static const uintptr_t inline_type_mask_in_place = inline_type_bit_in_place + lock_mask;
+   static const uintptr_t null_free_array_mask     = right_n_bits(null_free_array_bits);
+   static const uintptr_t null_free_array_mask_in_place = (null_free_array_mask << null_free_array_shift) | lock_mask_in_place;
+   static const uintptr_t null_free_array_bit_in_place  = (right_n_bits(null_free_array_bits) << null_free_array_shift);
+   static const uintptr_t flat_array_mask          = right_n_bits(flat_array_bits);
+   static const uintptr_t flat_array_mask_in_place = (flat_array_mask << flat_array_shift) | null_free_array_mask_in_place | lock_mask_in_place;
+   static const uintptr_t flat_array_bit_in_place  = right_n_bits(flat_array_bits) << flat_array_shift;
    static const uintptr_t age_mask                 = right_n_bits(age_bits);
    static const uintptr_t age_mask_in_place        = age_mask << age_shift;
+ 
+   static const uintptr_t larval_mask              = right_n_bits(larval_bits);
+   static const uintptr_t larval_mask_in_place     = (larval_mask << larval_shift) | inline_type_mask_in_place;
+   static const uintptr_t larval_bit_in_place      = right_n_bits(larval_bits) << larval_shift;
+ 
    static const uintptr_t hash_mask                = right_n_bits(hash_bits);
    static const uintptr_t hash_mask_in_place       = hash_mask << hash_shift;
  
  #ifdef _LP64
    // Used only with compact headers:

@@ -145,36 +188,51 @@
    static const uintptr_t locked_value             = 0;
    static const uintptr_t unlocked_value           = 1;
    static const uintptr_t monitor_value            = 2;
    static const uintptr_t marked_value             = 3;
  
+   static const uintptr_t inline_type_pattern      = inline_type_bit_in_place | unlocked_value;
+   static const uintptr_t null_free_array_pattern  = null_free_array_bit_in_place | unlocked_value;
+   static const uintptr_t null_free_flat_array_pattern = flat_array_bit_in_place | null_free_array_pattern;
+   static const uintptr_t nullable_flat_array_pattern = flat_array_bit_in_place | unlocked_value;
+ 
+   static const uintptr_t larval_pattern           = larval_bit_in_place | inline_type_pattern;
+ 
    static const uintptr_t no_hash                  = 0 ;  // no hash value assigned
    static const uintptr_t no_hash_in_place         = (uintptr_t)no_hash << hash_shift;
    static const uintptr_t no_lock_in_place         = unlocked_value;
  
    static const uint max_age                       = age_mask;
  
    // Creates a markWord with all bits set to zero.
    static markWord zero() { return markWord(uintptr_t(0)); }
  
+   bool is_inline_type() const {
+     return (mask_bits(value(), inline_type_mask_in_place) == inline_type_pattern);
+   }
+ 
    // lock accessors (note that these assume lock_shift == 0)
    bool is_locked()   const {
      return (mask_bits(value(), lock_mask_in_place) != unlocked_value);
    }
    bool is_unlocked() const {
      return (mask_bits(value(), lock_mask_in_place) == unlocked_value);
    }
    bool is_marked()   const {
      return (mask_bits(value(), lock_mask_in_place) == marked_value);
    }
+ 
+   // is unlocked and not an inline type (which cannot be involved in locking, displacement or inflation)
+   // i.e. test both lock bits and the inline type bit together
+   bool is_neutral()  const {  // Not locked, or marked - a "clean" neutral state
+     return (mask_bits(value(), inline_type_mask_in_place) == unlocked_value);
+   }
+ 
    bool is_forwarded() const {
      // Returns true for normal forwarded (0b011) and self-forwarded (0b1xx).
      return mask_bits(value(), lock_mask_in_place | self_fwd_mask_in_place) >= static_cast<intptr_t>(marked_value);
    }
-   bool is_neutral()  const {  // Not locked, or marked - a "clean" neutral state
-     return (mask_bits(value(), lock_mask_in_place) == unlocked_value);
-   }
  
    // Special temporary state of the markWord while being inflated.
    // Code that looks at mark outside a lock need to take this into account.
    bool is_being_inflated() const { return (value() == 0); }
  

@@ -187,11 +245,12 @@
    // Fast-locking does not use INFLATING.
    static markWord INFLATING() { return zero(); }    // inflate-in-progress
  
    // Should this header be preserved during GC?
    bool must_be_preserved() const {
-     return (!is_unlocked() || !has_no_hash());
+     return (!is_unlocked() || !has_no_hash() ||
+       (EnableValhalla && (is_larval_state() || is_inline_type() || is_flat_array() || is_null_free_array())));
    }
  
    // WARNING: The following routines are used EXCLUSIVELY by
    // synchronization functions. They are not really gc safe.
    // They must get updated if markWord layout get changed.

@@ -268,10 +327,38 @@
  
    bool has_no_hash() const {
      return hash() == no_hash;
    }
  
+   // private buffered value operations
+   markWord enter_larval_state() const {
+     return markWord(value() | larval_bit_in_place);
+   }
+   markWord exit_larval_state() const {
+     return markWord(value() & ~larval_bit_in_place);
+   }
+   bool is_larval_state() const {
+     return (mask_bits(value(), larval_mask_in_place) == larval_pattern);
+   }
+ 
+   bool is_flat_array() const {
+ #ifdef _LP64 // 64 bit encodings only
+     return (mask_bits(value(), flat_array_mask_in_place) == null_free_flat_array_pattern)
+            || (mask_bits(value(), flat_array_mask_in_place) == nullable_flat_array_pattern);
+ #else
+     return false;
+ #endif
+   }
+ 
+   bool is_null_free_array() const {
+ #ifdef _LP64 // 64 bit encodings only
+     return (mask_bits(value(), null_free_array_mask_in_place) == null_free_array_pattern);
+ #else
+     return false;
+ #endif
+   }
+ 
    inline Klass* klass() const;
    inline Klass* klass_or_null() const;
    inline Klass* klass_without_asserts() const;
    inline narrowKlass narrow_klass() const;
    inline markWord set_narrow_klass(narrowKlass narrow_klass) const;

@@ -279,18 +366,31 @@
    // Prototype mark for initialization
    static markWord prototype() {
      return markWord( no_hash_in_place | no_lock_in_place );
    }
  
+   static markWord inline_type_prototype() {
+     return markWord(inline_type_pattern);
+   }
+ 
+ #ifdef _LP64 // 64 bit encodings only
+   static markWord flat_array_prototype(LayoutKind lk);
+ 
+   static markWord null_free_array_prototype() {
+     return markWord(null_free_array_pattern);
+   }
+ #endif
+ 
    // Debugging
    void print_on(outputStream* st, bool print_monitor_info = true) const;
  
    // Prepare address of oop for placement into mark
    inline static markWord encode_pointer_as_mark(void* p) { return from_pointer(p).set_marked(); }
  
-   // Recover address of oop from encoded form used in mark
-   inline void* decode_pointer() const { return (void*)clear_lock_bits().value(); }
+   inline void* decode_pointer() const {
+     return (void*) (clear_lock_bits().value());
+   }
  
    inline bool is_self_forwarded() const {
      return mask_bits(value(), self_fwd_mask_in_place) != 0;
    }
  
< prev index next >