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

X: Remove popcnt specialization #20653

Merged
merged 1 commit into from
Nov 29, 2024
+1 −60
Merged

X: Remove popcnt specialization #20653

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
47 changes: 0 additions & 47 deletions runtime/compiler/x/codegen/J9TreeEvaluator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -882,12 +882,10 @@ extern void TEMPORARY_initJ9X86TreeEvaluatorTable(TR::CodeGenerator *cg)
tet[TR::ilbit] = TR::TreeEvaluator::integerLowestOneBit;
tet[TR::inolz] = TR::TreeEvaluator::integerNumberOfLeadingZeros;
tet[TR::inotz] = TR::TreeEvaluator::integerNumberOfTrailingZeros;
tet[TR::ipopcnt] = TR::TreeEvaluator::integerBitCount;
tet[TR::lhbit] = TR::TreeEvaluator::longHighestOneBit;
tet[TR::llbit] = TR::TreeEvaluator::longLowestOneBit;
tet[TR::lnolz] = TR::TreeEvaluator::longNumberOfLeadingZeros;
tet[TR::lnotz] = TR::TreeEvaluator::longNumberOfTrailingZeros;
tet[TR::lpopcnt] = TR::TreeEvaluator::longBitCount;
tet[TR::tstart] = TR::TreeEvaluator::tstartEvaluator;
tet[TR::tfinish] = TR::TreeEvaluator::tfinishEvaluator;
tet[TR::tabort] = TR::TreeEvaluator::tabortEvaluator;
Expand Down Expand Up @@ -3978,51 +3976,6 @@ TR::Register *J9::X86::TreeEvaluator::longNumberOfTrailingZeros(TR::Node *node,
return resultReg;
}

static
TR::Register *bitCount(TR::Node *node, TR::CodeGenerator *cg, TR::Register *reg, bool is64Bit)
{
TR::Register *bsfReg = cg->allocateRegister();
generateRegRegInstruction(TR::InstOpCode::POPCNTRegReg(is64Bit), node, bsfReg, reg, cg);
return bsfReg;
}

TR::Register *J9::X86::TreeEvaluator::integerBitCount(TR::Node *node, TR::CodeGenerator *cg)
{
TR_ASSERT(node->getNumChildren() == 1, "Node has a wrong number of children (i.e. !=1 )! ");
TR::Node* child = node->getFirstChild();
TR::Register* inputReg = cg->evaluate(child);
TR::Register* resultReg = bitCount(node, cg, inputReg, cg->comp()->target().is64Bit());
node->setRegister(resultReg);
cg->decReferenceCount(child);
return resultReg;
}

TR::Register *J9::X86::TreeEvaluator::longBitCount(TR::Node *node, TR::CodeGenerator *cg)
{
TR_ASSERT(node->getNumChildren() == 1, "Node has a wrong number of children (i.e. !=1 )! ");
TR::Node * child = node->getFirstChild();
TR::Register * inputReg = cg->evaluate(child);
TR::Register * resultReg = NULL;
if (cg->comp()->target().is64Bit())
{
resultReg = bitCount(node, cg, inputReg, true);
}
else
{
//add low result and high result together
TR::Register * inputHigh = inputReg->getHighOrder();
TR::Register * inputLow = inputReg->getLowOrder();
TR::Register * resultLow = bitCount(node, cg, inputLow, false);
TR::Register * resultHigh = bitCount(node, cg, inputHigh, false);
generateRegRegInstruction(TR::InstOpCode::ADD4RegReg, node, resultLow, resultHigh, cg);
cg->stopUsingRegister(resultHigh);
resultReg = resultLow;
}
node->setRegister(resultReg);
cg->decReferenceCount(child);
return resultReg;
}

inline void generateInlinedCheckCastForDynamicCastClass(TR::Node* node, TR::CodeGenerator* cg)
{
TR::Compilation *comp = cg->comp();
Expand Down
2 changes: 0 additions & 2 deletions runtime/compiler/x/codegen/J9TreeEvaluator.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,10 @@ class OMR_EXTENSIBLE TreeEvaluator: public J9::TreeEvaluator
static TR::Register *integerLowestOneBit(TR::Node *node, TR::CodeGenerator *cg);
static TR::Register *integerNumberOfLeadingZeros(TR::Node *node, TR::CodeGenerator *cg);
static TR::Register *integerNumberOfTrailingZeros(TR::Node *node, TR::CodeGenerator *cg);
static TR::Register *integerBitCount(TR::Node *node, TR::CodeGenerator *cg);
Spencer-Comin marked this conversation as resolved.
Show resolved Hide resolved
static TR::Register *longHighestOneBit(TR::Node *node, TR::CodeGenerator *cg);
static TR::Register *longLowestOneBit(TR::Node *node, TR::CodeGenerator *cg);
static TR::Register *longNumberOfLeadingZeros(TR::Node *node, TR::CodeGenerator *cg);
static TR::Register *longNumberOfTrailingZeros(TR::Node *node, TR::CodeGenerator *cg);
static TR::Register *longBitCount(TR::Node *node, TR::CodeGenerator *cg);
static TR::Register *tstartEvaluator(TR::Node *node, TR::CodeGenerator *cg);
static TR::Register *tfinishEvaluator(TR::Node *node, TR::CodeGenerator *cg);
static TR::Register *tabortEvaluator(TR::Node *node, TR::CodeGenerator *cg);
Expand Down
9 changes: 0 additions & 9 deletions runtime/compiler/x/env/J9CPU.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,15 +115,6 @@ J9::X86::CPU::getProcessorSignature()
return self()->getX86ProcessorSignature();
}

bool
J9::X86::CPU::hasPopulationCountInstruction()
{
if ((self()->getX86ProcessorFeatureFlags2() & TR_POPCNT) != 0x00000000)
return true;
else
return false;
}

bool
J9::X86::CPU::isCompatible(const OMRProcessorDesc& processorDescription)
{
Expand Down
3 changes: 1 addition & 2 deletions runtime/compiler/x/env/J9CPU.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class OMR_EXTENSIBLE CPU : public J9::CPU

public:

/**
/**
* @brief A factory method used to construct a CPU object for portable AOT compilations
* @param[in] omrPortLib : the port library
* @return TR::CPU
Expand All @@ -73,7 +73,6 @@ class OMR_EXTENSIBLE CPU : public J9::CPU
uint32_t getProcessorSignature();

bool testOSForSSESupport() { return true; } // VM guarantees SSE/SSE2 are available
bool hasPopulationCountInstruction();

bool isCompatible(const OMRProcessorDesc& processorDescription);

Expand Down