Merge pull request #14039 from RSalman/satb-bar

Standard SATB Barrier Implementation

runtime/gc_base/GenerationalAccessBarrierComponent.cpp

@@ -1,6 +1,6 @@
 
 /*******************************************************************************
- * Copyright (c) 1991, 2017 IBM Corp. and others
+ * Copyright (c) 1991, 2021 IBM Corp. and others
  *
  * This program and the accompanying materials are made available under
  * the terms of the Eclipse Public License 2.0 which accompanies this
@@ -133,7 +133,7 @@ MM_GenerationalAccessBarrierComponent::postObjectStore(J9VMThread *vmThread, J9O
  * to optimistically add an object to the remembered set without checking too hard.
  */
 void 
-MM_GenerationalAccessBarrierComponent::preBatchObjectStore(J9VMThread *vmThread, J9Object *dstObject)
+MM_GenerationalAccessBarrierComponent::postBatchObjectStore(J9VMThread *vmThread, J9Object *dstObject)
 {
 	MM_EnvironmentBase *env = MM_EnvironmentBase::getEnvironment(vmThread->omrVMThread);
 	MM_GCExtensions *extensions = MM_GCExtensions::getExtensions(env);

runtime/gc_base/GenerationalAccessBarrierComponent.hpp

@@ -1,6 +1,6 @@
 
 /*******************************************************************************
- * Copyright (c) 1991, 2014 IBM Corp. and others
+ * Copyright (c) 1991, 2021 IBM Corp. and others
  *
  * This program and the accompanying materials are made available under
  * the terms of the Eclipse Public License 2.0 which accompanies this
@@ -53,7 +53,7 @@ class MM_GenerationalAccessBarrierComponent : public MM_BaseNonVirtual
 	void tearDown(MM_EnvironmentBase *env);
 
 	void postObjectStore(J9VMThread *vmThread, J9Object *dstObject, J9Object *srcObject);
-	void preBatchObjectStore(J9VMThread *vmThread, J9Object *dstObject);
+	void postBatchObjectStore(J9VMThread *vmThread, J9Object *dstObject);
 
 	MM_GenerationalAccessBarrierComponent()
 	{

runtime/gc_base/ObjectAccessBarrier.cpp

@@ -2047,7 +2047,7 @@ MM_ObjectAccessBarrier::postObjectStore(J9VMThread *vmThread, J9Object **destAdd
  * TODO: This should probably be postBatchObjectStore, not pre-.
  */
 bool
-MM_ObjectAccessBarrier::preBatchObjectStore(J9VMThread *vmThread, J9Object *destObject, bool isVolatile)
+MM_ObjectAccessBarrier::postBatchObjectStore(J9VMThread *vmThread, J9Object *destObject, bool isVolatile)
 {
 #if defined(J9VM_GC_COMBINATION_SPEC)
 	/* (assert here to verify that we aren't defaulting to this implementation through some unknown path - delete once combination is stable) */
@@ -2057,7 +2057,7 @@ MM_ObjectAccessBarrier::preBatchObjectStore(J9VMThread *vmThread, J9Object *dest
 }
 
 bool
-MM_ObjectAccessBarrier::preBatchObjectStore(J9VMThread *vmThread, J9Class *destClass, bool isVolatile)
+MM_ObjectAccessBarrier::postBatchObjectStore(J9VMThread *vmThread, J9Class *destClass, bool isVolatile)
 {
 #if defined(J9VM_GC_COMBINATION_SPEC)
 	/* (assert here to verify that we aren't defaulting to this implementation through some unknown path - delete once combination is stable) */

runtime/gc_base/ObjectAccessBarrier.hpp

@@ -256,8 +256,8 @@ class MM_ObjectAccessBarrier : public MM_BaseVirtual
 	virtual void postObjectStore(J9VMThread *vmThread, J9Class *destClass, J9Object **destAddress, J9Object *value, bool isVolatile=false);
 	virtual void postObjectStore(J9VMThread *vmThread, J9Object **destAddress, J9Object *value, bool isVolatile=false);
 
-	virtual bool preBatchObjectStore(J9VMThread *vmThread, J9Object *destObject, bool isVolatile=false);
-	virtual bool preBatchObjectStore(J9VMThread *vmThread, J9Class *destClass, bool isVolatile=false);
+	virtual bool postBatchObjectStore(J9VMThread *vmThread, J9Object *destObject, bool isVolatile=false);
+	virtual bool postBatchObjectStore(J9VMThread *vmThread, J9Class *destClass, bool isVolatile=false);
 
 	virtual bool preObjectRead(J9VMThread *vmThread, J9Object *srcObject, fj9object_t *srcAddress);
 	virtual bool preObjectRead(J9VMThread *vmThread, J9Class *srcClass, j9object_t *srcAddress);

runtime/gc_base/accessBarrier.cpp

@@ -698,15 +698,15 @@ J9WriteBarrierBatch(J9VMThread *vmThread, J9Object *dstObject)
 {
 	MM_ObjectAccessBarrier *barrier = MM_GCExtensions::getExtensions(vmThread->javaVM)->accessBarrier;
 	/* In Metronome, write barriers are always pre-store */
-	barrier->preBatchObjectStore(vmThread, dstObject);	
+	barrier->postBatchObjectStore(vmThread, dstObject);
 }
 
 void
 J9WriteBarrierClassBatch(J9VMThread *vmThread, J9Class *dstClazz)
 {
 	MM_ObjectAccessBarrier *barrier = MM_GCExtensions::getExtensions(vmThread->javaVM)->accessBarrier;
 	/* In Metronome, write barriers are always pre-store */
-	barrier->preBatchObjectStore(vmThread, dstClazz);	
+	barrier->postBatchObjectStore(vmThread, dstClazz);
 }
 
 void

runtime/gc_glue_java/GlobalCollectorDelegate.cpp

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2017, 2020 IBM Corp. and others
+ * Copyright (c) 2017, 2021 IBM Corp. and others
  *
  * This program and the accompanying materials are made available under
  * the terms of the Eclipse Public License 2.0 which accompanies this
@@ -103,11 +103,11 @@ MM_GlobalCollectorDelegate::initialize(MM_EnvironmentBase *env, MM_GlobalCollect
 
 #if defined(OMR_ENV_DATA64) && defined(OMR_GC_FULL_POINTERS)
 		if (1 == _extensions->fvtest_enableReadBarrierVerification) {
-			_extensions->accessBarrier = MM_ReadBarrierVerifier::newInstance(env);
+			_extensions->accessBarrier = MM_ReadBarrierVerifier::newInstance(env, _markingScheme);
 		} else
 #endif /* defined(OMR_ENV_DATA64) && defined(OMR_GC_FULL_POINTERS) */
 		{
-			_extensions->accessBarrier = MM_StandardAccessBarrier::newInstance(env);
+			_extensions->accessBarrier = MM_StandardAccessBarrier::newInstance(env, _markingScheme);
 		}
 
 		if (NULL == _extensions->accessBarrier) {

runtime/gc_modron_standard/ReadBarrierVerifier.cpp

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 1991, 2020 IBM Corp. and others
+ * Copyright (c) 1991, 2021 IBM Corp. and others
  *
  * This program and the accompanying materials are made available under
  * the terms of the Eclipse Public License 2.0 which accompanies this
@@ -44,13 +44,13 @@
 #if defined(OMR_ENV_DATA64) && defined(OMR_GC_FULL_POINTERS)
 
 MM_ReadBarrierVerifier *
-MM_ReadBarrierVerifier::newInstance(MM_EnvironmentBase *env)
+MM_ReadBarrierVerifier::newInstance(MM_EnvironmentBase *env, MM_MarkingScheme *markingScheme)
 {
 	MM_ReadBarrierVerifier *barrier;
 
 	barrier = (MM_ReadBarrierVerifier *)env->getForge()->allocate(sizeof(MM_ReadBarrierVerifier), MM_AllocationCategory::FIXED, J9_GET_CALLSITE());
 	if (barrier) {
-		new(barrier) MM_ReadBarrierVerifier(env);
+		new(barrier) MM_ReadBarrierVerifier(env, markingScheme);
 		if (!barrier->initialize(env)) {
 			barrier->kill(env);
 			barrier = NULL;

runtime/gc_modron_standard/ReadBarrierVerifier.hpp

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 1991, 2020 IBM Corp. and others
+ * Copyright (c) 1991, 2021 IBM Corp. and others
  *
  * This program and the accompanying materials are made available under
  * the terms of the Eclipse Public License 2.0 which accompanies this
@@ -48,11 +48,11 @@
 	virtual bool initialize(MM_EnvironmentBase *env);
 	virtual void tearDown(MM_EnvironmentBase *env);
 public:
-	static MM_ReadBarrierVerifier *newInstance(MM_EnvironmentBase *env);
+	static MM_ReadBarrierVerifier *newInstance(MM_EnvironmentBase *env, MM_MarkingScheme *markingScheme);
 	virtual void kill(MM_EnvironmentBase *env);
 
-	MM_ReadBarrierVerifier(MM_EnvironmentBase *env) :
-		MM_StandardAccessBarrier(env)
+	MM_ReadBarrierVerifier(MM_EnvironmentBase *env, MM_MarkingScheme *markingScheme) :
+		MM_StandardAccessBarrier(env, markingScheme)
 	{
 		_typeId = __FUNCTION__;
 	}