Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update supportsInlineConcurrentLinkedQueue to check for CTX #20413

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Update supportsInlineConcurrentLinkedQueue to check for CTX #20413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions runtime/compiler/z/codegen/J9CodeGenerator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,16 @@ J9::Z::CodeGenerator::initialize()
cg->setSupportsInlineStringLatin1Inflate();
}

// See comment in `handleHardwareReadBarrier` implementation as to why we cannot support CTX under CS
if (cg->getSupportsTM() && TR::Compiler->om.readBarrierType() == gc_modron_readbar_none)
// For IBM Java 8 ConcurrentLinkedQueue.poll and offer has been accelerated
// using constrained transactional execution instructions.
// If CTX feature is supported on processor, and JIT has not disabled it
// using TR_DisableTM option, then inlining of ConcurrentLinkedQueue.poll/offer
// is supported.
// See comment in `handleHardwareReadBarrier` implementation as to why we
// cannot support CTX under CS
if ((comp->target().cpu.supportsFeature(OMR_FEATURE_S390_CONSTRAINED_TRANSACTIONAL_EXECUTION_FACILITY)
&& !comp->getOption(TR_DisableTM))
&& TR::Compiler->om.readBarrierType() == gc_modron_readbar_none)
{
cg->setSupportsInlineConcurrentLinkedQueue();
}
Expand Down
56 changes: 34 additions & 22 deletions runtime/compiler/z/codegen/J9TreeEvaluator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13045,28 +13045,29 @@ J9::Z::TreeEvaluator::inlineConcurrentLinkedQueueTMOffer(TR::Node *node, TR::Cod

bool usesCompressedrefs = comp->useCompressedPointers();
int32_t shiftAmount = TR::Compiler->om.compressedReferenceShift();
static char * disableTMOfferenv = feGetEnv("TR_DisableTMOffer");
bool disableTMOffer = (disableTMOfferenv != NULL);

static bool disableTMOffer = feGetEnv("TR_DisableTMOffer") != NULL;

classBlock1 = fej9->getClassFromSignature("Ljava/util/concurrent/ConcurrentLinkedQueue$Node;", 49, comp->getCurrentMethod(), true);
classBlock2 = fej9->getClassFromSignature("Ljava/util/concurrent/ConcurrentLinkedQueue;", 44, comp->getCurrentMethod(), true);


if (classBlock1 && classBlock2)
bool canInlineTMOffer = !disableTMOffer;
if (classBlock1 != NULL && classBlock2 != NULL)
{
offsetNext = fej9->getObjectHeaderSizeInBytes() + fej9->getInstanceFieldOffset(classBlock1, "next", 4, "Ljava/util/concurrent/ConcurrentLinkedQueue$Node;", 49);
offsetTail = fej9->getObjectHeaderSizeInBytes() + fej9->getInstanceFieldOffset(classBlock2, "tail", 4, "Ljava/util/concurrent/ConcurrentLinkedQueue$Node;", 49);
}
else
disableTMOffer = true;
{
canInlineTMOffer = false;
}

cursor = generateRIInstruction(cg, TR::InstOpCode::LHI, node, rReturn, 1);

static char * debugTM= feGetEnv("TR_DebugTM");
static bool debugTM= feGetEnv("TR_DebugTM") != NULL;

if (debugTM)
{
if (disableTMOffer)
if (!canInlineTMOffer)
{
printf ("\nTM: disabling TM CLQ.Offer in %s (%s)", comp->signature(), comp->getHotnessName(comp->getMethodHotness()));
fflush(stdout);
Expand All @@ -13077,14 +13078,16 @@ J9::Z::TreeEvaluator::inlineConcurrentLinkedQueueTMOffer(TR::Node *node, TR::Cod
fflush(stdout);
}
}
static bool generateNonConstrainedTMEnvSeq = feGetEnv("TR_UseNonConstrainedTM") != NULL;

bool useNonConstrainedTM = generateNonConstrainedTMEnvSeq && comp->target().cpu.supportsFeature(OMR_FEATURE_S390_TRANSACTIONAL_EXECUTION_FACILITY);

static char * useNonConstrainedTM = feGetEnv("TR_UseNonConstrainedTM");
static char * disableNIAI = feGetEnv("TR_DisableNIAI");
static bool disableNIAI = feGetEnv("TR_DisableNIAI") != NULL;

// the Transaction Diagnostic Block (TDB) is a memory location for the OS to write state info in the event of an abort
TR::MemoryReference* TDBmemRef = generateS390MemoryReference(cg->getMethodMetaDataRealRegister(), fej9->thisThreadGetTDBOffset(), cg);

if (!disableTMOffer)
if (canInlineTMOffer)
{
if (useNonConstrainedTM)
{
Expand Down Expand Up @@ -13186,7 +13189,7 @@ J9::Z::TreeEvaluator::inlineConcurrentLinkedQueueTMOffer(TR::Node *node, TR::Cod
cursor = generateSInstruction(cg, TR::InstOpCode::TEND, node, generateS390MemoryReference(cg->machine()->getRealRegister(TR::RealRegister::GPR0),0,cg));
}

if (useNonConstrainedTM || disableTMOffer)
if (useNonConstrainedTM || !canInlineTMOffer)
cursor = generateS390LabelInstruction(cg, TR::InstOpCode::label, node, failLabel, deps);

genWrtBarForTM(node, cg, rP, rN, rReturn, true);
Expand Down Expand Up @@ -13237,28 +13240,33 @@ J9::Z::TreeEvaluator::inlineConcurrentLinkedQueueTMPoll(TR::Node *node, TR::Code
deps->addPostCondition(rTmp, TR::RealRegister::AssignAny);
}

static char * disableTMPollenv = feGetEnv("TR_DisableTMPoll");
bool disableTMPoll = disableTMPollenv;
static bool disableTMPoll = feGetEnv("TR_DisableTMPoll") != NULL;

classBlock1 = fej9->getClassFromSignature("Ljava/util/concurrent/ConcurrentLinkedQueue;", 44, comp->getCurrentMethod(), true);
classBlock2 = fej9->getClassFromSignature("Ljava/util/concurrent/ConcurrentLinkedQueue$Node;", 49, comp->getCurrentMethod(), true);

if (classBlock1 && classBlock2)
bool canInlineTMPoll = !disableTMPoll;
if (classBlock1 != NULL && classBlock2 != NULL)
{
offsetHead = fej9->getObjectHeaderSizeInBytes() + fej9->getInstanceFieldOffset(classBlock1, "head", 4, "Ljava/util/concurrent/ConcurrentLinkedQueue$Node;", 49);
offsetNext = fej9->getObjectHeaderSizeInBytes() + fej9->getInstanceFieldOffset(classBlock2, "next", 4, "Ljava/util/concurrent/ConcurrentLinkedQueue$Node;", 49);
offsetItem = fej9->getObjectHeaderSizeInBytes() + fej9->getInstanceFieldOffset(classBlock2, "item", 4, "Ljava/lang/Object;", 18);
}
else
disableTMPoll = true;
{
// If we can not get Class object fo ConcurrentLinkedQueue /
// ConcurrentLinkedQueue$Node, then we can not inline the intrinsic
// operation.
canInlineTMPoll = false;
}

cursor = generateRRInstruction(cg, TR::InstOpCode::getXORRegOpCode(), node, rE, rE);

static char * debugTM= feGetEnv("TR_DebugTM");
static bool debugTM= feGetEnv("TR_DebugTM") != NULL;

if (debugTM)
{
if (disableTMPoll)
if (!canInlineTMPoll)
{
printf ("\nTM: disabling TM CLQ.Poll in %s (%s)", comp->signature(), comp->getHotnessName(comp->getMethodHotness()));
fflush(stdout);
Expand All @@ -13270,13 +13278,17 @@ J9::Z::TreeEvaluator::inlineConcurrentLinkedQueueTMPoll(TR::Node *node, TR::Code
}
}

static char * useNonConstrainedTM = feGetEnv("TR_UseNonConstrainedTM");
static char * disableNIAI = feGetEnv("TR_DisableNIAI");

static bool generateNonConstrainedTMEnvSeq = feGetEnv("TR_UseNonConstrainedTM") != NULL;

bool useNonConstrainedTM = generateNonConstrainedTMEnvSeq && comp->target().cpu.supportsFeature(OMR_FEATURE_S390_TRANSACTIONAL_EXECUTION_FACILITY);

static bool disableNIAI = feGetEnv("TR_DisableNIAI") != NULL;

// the Transaction Diagnostic Block (TDB) is a memory location for the OS to write state info in the event of an abort
TR::MemoryReference* TDBmemRef = generateS390MemoryReference(cg->getMethodMetaDataRealRegister(), fej9->thisThreadGetTDBOffset(), cg);

if (!disableTMPoll)
if (canInlineTMPoll)
{
if (useNonConstrainedTM)
{
Expand Down Expand Up @@ -13368,7 +13380,7 @@ J9::Z::TreeEvaluator::inlineConcurrentLinkedQueueTMPoll(TR::Node *node, TR::Code
cursor = generateSInstruction(cg, TR::InstOpCode::TEND, node, generateS390MemoryReference(cg->machine()->getRealRegister(TR::RealRegister::GPR0),0,cg));
}

if (useNonConstrainedTM || disableTMPoll)
if (useNonConstrainedTM || !canInlineTMPoll)
cursor = generateS390LabelInstruction(cg, TR::InstOpCode::label, node, failLabel, deps);

if (usesCompressedrefs)
Expand Down