Conditional compile CPU specific code

Author: caizixian

openjdk/CompileThirdPartyHeap.gmk

@@ -71,8 +71,8 @@ JVM_LDFLAGS += '-Wl,-rpath,$$ORIGIN'
 FORCE:
 
 TARGETS += $(LIB_MMTK)
-JVM_SRC_DIRS += $(MMTK_CPP_ROOT) $(MMTK_CPP_ROOT)/barriers
-JVM_CFLAGS += -std=c++14 -fpermissive -DINCLUDE_THIRD_PARTY_HEAP -DTHIRD_PARTY_HEAP_SRC=$(MMTK_CPP_ROOT)
+JVM_SRC_DIRS += $(MMTK_CPP_ROOT)/share $(MMTK_CPP_ROOT)/share/barriers $(MMTK_CPP_ROOT)/cpu/$(HOTSPOT_TARGET_CPU_ARCH)
+JVM_CFLAGS += -std=c++14 -fpermissive -DINCLUDE_THIRD_PARTY_HEAP -DTHIRD_PARTY_HEAP_SRC=$(MMTK_CPP_ROOT)/share -I$(MMTK_CPP_ROOT)/share -I$(MMTK_CPP_ROOT)/cpu/$(HOTSPOT_TARGET_CPU_ARCH)
 ifeq ($(GLOBAL_ALLOC_BIT), 1)
   JVM_CFLAGS += -DMMTK_ENABLE_GLOBAL_ALLOC_BIT
 endif

openjdk/mmtkBarrierSetAssembler_x86.cpp renamed to openjdk/cpu/x86/mmtkBarrierSetAssembler_x86.cpp

@@ -21,7 +21,6 @@
  * questions.
  *
  */
-#ifndef ZERO
 #include "precompiled.hpp"
 #include "asm/macroAssembler.inline.hpp"
 #include "interpreter/interp_masm.hpp"
@@ -32,6 +31,7 @@
 #include "runtime/sharedRuntime.hpp"
 #include "utilities/macros.hpp"
 #include "c1/c1_LIRAssembler.hpp"
+#include "c1/c1_MacroAssembler.hpp"
 
 #define __ masm->
 
@@ -196,4 +196,3 @@ void MMTkBarrierSetAssembler::generate_c1_write_barrier_stub_call(LIR_Assembler*
 }
 
 #undef __
-#endif

openjdk/mmtkBarrierSetAssembler_x86.hpp renamed to openjdk/cpu/x86/mmtkBarrierSetAssembler_x86.hpp

@@ -1,9 +1,6 @@
 #ifndef MMTK_OPENJDK_MMTK_BARRIER_SET_ASSEMBLER_X86_HPP
 #define MMTK_OPENJDK_MMTK_BARRIER_SET_ASSEMBLER_X86_HPP
 
-#ifdef ZERO
-class MMTkBarrierSetAssembler;
-#else
 #include "asm/macroAssembler.hpp"
 #include "gc/shared/barrierSetAssembler.hpp"
 
@@ -33,8 +30,8 @@ class MMTkBarrierSetAssembler: public BarrierSetAssembler {
   virtual void generate_c1_write_barrier_runtime_stub(StubAssembler* sasm) const;
 
 public:
-  virtual void eden_allocate(MacroAssembler* masm, Register thread, Register obj, Register var_size_in_bytes, int con_size_in_bytes, Register t1, Label& slow_case) override;
-  virtual void store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type, Address dst, Register val, Register tmp1, Register tmp2, Register tmp3) override {
+  virtual void eden_allocate(MacroAssembler* masm, Register thread, Register obj, Register var_size_in_bytes, int con_size_in_bytes, Register t1, Label& slow_case);
+  virtual void store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type, Address dst, Register val, Register tmp1, Register tmp2, Register tmp3) {
     if (type == T_OBJECT || type == T_ARRAY) object_reference_write_pre(masm, decorators, dst, val, tmp1, tmp2);
     BarrierSetAssembler::store_at(masm, decorators, type, dst, val, tmp1, tmp2, tmp3);
     if (type == T_OBJECT || type == T_ARRAY) object_reference_write_post(masm, decorators, dst, val, tmp1, tmp2);
@@ -43,5 +40,4 @@ class MMTkBarrierSetAssembler: public BarrierSetAssembler {
   /// Generate C1 write barrier slow-call stub
   static void generate_c1_write_barrier_stub_call(LIR_Assembler* ce, MMTkC1BarrierStub* stub);
 };
-#endif
 #endif // MMTK_OPENJDK_MMTK_BARRIER_SET_ASSEMBLER_X86_HPP

openjdk/cpu/zero/mmtkBarrierSetAssembler_zero.hpp

@@ -0,0 +1,5 @@
+#ifndef MMTK_OPENJDK_MMTK_BARRIER_SET_ASSEMBLER_ZERO_HPP
+#define MMTK_OPENJDK_MMTK_BARRIER_SET_ASSEMBLER_ZERO_HPP
+
+class MMTkBarrierSetAssembler;
+#endif // MMTK_OPENJDK_MMTK_BARRIER_SET_ASSEMBLER_ZERO_HPP

openjdk/barriers/mmtkNoBarrier.hpp renamed to openjdk/share/barriers/mmtkNoBarrier.hpp

@@ -2,7 +2,8 @@
 #define MMTK_OPENJDK_BARRIERS_MMTK_NO_BARRIER_HPP
 
 #include "../mmtkBarrierSet.hpp"
-#include "../mmtkBarrierSetAssembler_x86.hpp"
+#include "utilities/macros.hpp"
+#include CPU_HEADER(mmtkBarrierSetAssembler)
 #ifdef COMPILER1
 #include "../mmtkBarrierSetC1.hpp"
 class MMTkNoBarrierSetC1: public MMTkBarrierSetC1 {};

openjdk/barriers/mmtkObjectBarrier.cpp renamed to openjdk/share/barriers/mmtkObjectBarrier.cpp

@@ -17,6 +17,7 @@ void MMTkObjectBarrierSetRuntime::object_reference_write_post(oop src, oop* slot
 #endif
 }
 
+#ifndef ZERO
 #define __ masm->
 
 void MMTkObjectBarrierSetAssembler::object_reference_write_post(MacroAssembler* masm, DecoratorSet decorators, Address dst, Register val, Register tmp1, Register tmp2) const {
@@ -51,7 +52,11 @@ void MMTkObjectBarrierSetAssembler::object_reference_write_post(MacroAssembler*
 
   __ movptr(c_rarg0, obj);
   __ lea(c_rarg1, dst);
-  __ movptr(c_rarg2, val == noreg ?  (int32_t) NULL_WORD : val);
+  if (val == noreg) {
+    __ movptr(c_rarg2, NULL_WORD);
+  } else {
+    __ movptr(c_rarg2, val);
+  }
   __ call_VM_leaf_base(FN_ADDR(MMTkBarrierSetRuntime::object_reference_write_slow_call), 3);
 
   __ bind(done);
@@ -77,6 +82,9 @@ void MMTkObjectBarrierSetAssembler::arraycopy_epilogue(MacroAssembler* masm, Dec
 
 #undef __
 
+#endif
+
+#ifdef COMPILER1
 #ifdef ASSERT
 #define __ gen->lir(__FILE__, __LINE__)->
 #else
@@ -150,7 +158,9 @@ void MMTkObjectBarrierSetC1::object_reference_write_post(LIRAccess& access, LIR_
 }
 
 #undef __
+#endif
 
+#ifdef COMPILER2
 #define __ ideal.
 
 void MMTkObjectBarrierSetC2::object_reference_write_post(GraphKit* kit, Node* src, Node* slot, Node* val) const {
@@ -183,3 +193,4 @@ void MMTkObjectBarrierSetC2::object_reference_write_post(GraphKit* kit, Node* sr
 }
 
 #undef __
+#endif

openjdk/barriers/mmtkObjectBarrier.hpp renamed to openjdk/share/barriers/mmtkObjectBarrier.hpp

@@ -3,14 +3,21 @@
 
 #include "../mmtk.h"
 #include "../mmtkBarrierSet.hpp"
-#include "../mmtkBarrierSetAssembler_x86.hpp"
+#ifndef ZERO
+#include "utilities/macros.hpp"
+#include CPU_HEADER(mmtkBarrierSetAssembler)
+#endif
+#ifdef COMPILER1
 #include "../mmtkBarrierSetC1.hpp"
-#include "../mmtkBarrierSetC2.hpp"
 #include "c1/c1_LIRAssembler.hpp"
 #include "c1/c1_MacroAssembler.hpp"
-#include "gc/shared/barrierSet.hpp"
+#endif
+#ifdef COMPILER2
+#include "../mmtkBarrierSetC2.hpp"
 #include "opto/callnode.hpp"
 #include "opto/idealKit.hpp"
+#endif
+#include "gc/shared/barrierSet.hpp"
 
 #define SIDE_METADATA_WORST_CASE_RATIO_LOG 1
 #define LOG_BYTES_IN_CHUNK 22
@@ -27,13 +34,18 @@ class MMTkObjectBarrierSetRuntime: public MMTkBarrierSetRuntime {
   }
 };
 
+#ifdef ZERO
+class MMTkObjectBarrierSetAssembler;
+#else
 class MMTkObjectBarrierSetAssembler: public MMTkBarrierSetAssembler {
 protected:
   virtual void object_reference_write_post(MacroAssembler* masm, DecoratorSet decorators, Address dst, Register val, Register tmp1, Register tmp2) const override;
 public:
   virtual void arraycopy_epilogue(MacroAssembler* masm, DecoratorSet decorators, BasicType type, Register src, Register dst, Register count) override;
 };
+#endif
 
+#ifdef COMPILER1
 class MMTkObjectBarrierSetC1: public MMTkBarrierSetC1 {
 protected:
   virtual void object_reference_write_post(LIRAccess& access, LIR_Opr src, LIR_Opr slot, LIR_Opr new_val) const override;
@@ -42,11 +54,18 @@ class MMTkObjectBarrierSetC1: public MMTkBarrierSetC1 {
     return MMTkBarrierSetC1::resolve_address_in_register(access, resolve_in_register);
   }
 };
+#else
+class MMTkObjectBarrierSetC1;
+#endif
 
+#ifdef COMPILER2
 class MMTkObjectBarrierSetC2: public MMTkBarrierSetC2 {
 protected:
   virtual void object_reference_write_post(GraphKit* kit, Node* src, Node* slot, Node* val) const override;
 };
+#else
+class MMTkObjectBarrierSetC2;
+#endif
 
 struct MMTkObjectBarrier: MMTkBarrierImpl<
   MMTkObjectBarrierSetRuntime,

openjdk/mmtk.h renamed to openjdk/share/mmtk.h

@@ -24,9 +24,10 @@
 
 #include "precompiled.hpp"
 #include "barriers/mmtkNoBarrier.hpp"
-// #include "barriers/mmtkObjectBarrier.hpp"
+#include "barriers/mmtkObjectBarrier.hpp"
 #include "mmtkBarrierSet.hpp"
-#include "mmtkBarrierSetAssembler_x86.hpp"
+#include "utilities/macros.hpp"
+#include CPU_HEADER(mmtkBarrierSetAssembler)
 #include "runtime/interfaceSupport.inline.hpp"
 #ifdef COMPILER1
 #include "mmtkBarrierSetC1.hpp"
@@ -77,9 +78,9 @@ MMTkBarrierBase* get_selected_barrier() {
   static MMTkBarrierBase* selected_barrier = NULL;
   if (selected_barrier) return selected_barrier;
   const char* barrier = mmtk_active_barrier();
-  printf("mmtk_active_barrier %s\n", barrier);
+  // printf("mmtk_active_barrier %s\n", barrier);
   if (strcmp(barrier, "NoBarrier") == 0) selected_barrier = new MMTkNoBarrier();
-  // else if (strcmp(barrier, "ObjectBarrier") == 0) selected_barrier = new MMTkObjectBarrier();
+  else if (strcmp(barrier, "ObjectBarrier") == 0) selected_barrier = new MMTkObjectBarrier();
   else guarantee(false, "Unimplemented");
   return selected_barrier;
 }

openjdk/mmtkBarrierSet.cpp renamed to openjdk/share/mmtkBarrierSet.cpp

@@ -30,12 +30,12 @@
 #include "gc/shared/barrierSetConfig.hpp"
 #include "memory/memRegion.hpp"
 #include "mmtk.h"
-#include "mmtkBarrierSetAssembler_x86.hpp"
 #include "oops/access.hpp"
 #include "oops/accessBackend.hpp"
 #include "oops/oopsHierarchy.hpp"
 #include "utilities/fakeRttiSupport.hpp"
 #include "utilities/macros.hpp"
+#include CPU_HEADER(mmtkBarrierSetAssembler)
 
 #define MMTK_ENABLE_ALLOCATION_FASTPATH true
 #define MMTK_ENABLE_BARRIER_FASTPATH true