use counter

Author: luke-li-2003

runtime/compiler/p/codegen/J9TreeEvaluator.cpp

@@ -11716,7 +11716,6 @@ static TR::Register *inlineStringCodingHasNegativesOrCountPositives(TR::Node *no
    TR::Register *vtmp2Reg = cg->allocateRegister(TR_VRF);
 
    TR::Register *storeReg = cg->allocateRegister();
-   TR::Register *maskReg = cg->allocateRegister();
 
    TR::LabelSymbol *VSXLabel = generateLabelSymbol(cg);
    TR::LabelSymbol *serialPrepLabel = generateLabelSymbol(cg);
@@ -11817,16 +11816,20 @@ static TR::Register *inlineStringCodingHasNegativesOrCountPositives(TR::Node *no
 
    // --- serialPrepLabel to deal with whatever remains
    generateLabelInstruction(cg, TR::InstOpCode::label, node, serialPrepLabel);
-   // do we have enough elements to use the unroll loop?
-   generateTrg1Src1ImmInstruction(cg, TR::InstOpCode::addi, node, tempReg, lengthReg, -3);
+
+   // calculate the count for unroll loop
+   generateTrg1Src2Instruction(cg, TR::InstOpCode::subf, node, tempReg, indexReg, lengthReg);
+   generateTrg1Src1ImmInstruction(cg, TR::InstOpCode::srawi, node, tempReg, tempReg, 2);
+   generateSrc1Instruction(cg, TR::InstOpCode::mtctr, node, tempReg);
+
    // we need to use 4 individual masks instead for countPositves() in LE
    if (!isLE || !isCountPositives)
       {
-      // we want to load 0x80808080 in to maskReg, but lis was designed for signed values,
+      // we want to load 0x80808080 in to tempReg, but lis was designed for signed values,
       // and would throw an error for 0x8080, yet it could accept the equivalent negative value of it;
       // we don't worry about sign extension since the upper word should be 0 in storeReg after lwzx
-      generateTrg1ImmInstruction(cg, TR::InstOpCode::lis, node, maskReg, -32640);
-      generateTrg1Src1ImmInstruction(cg, TR::InstOpCode::ori, node, maskReg, maskReg, 0x8080);
+      generateTrg1ImmInstruction(cg, TR::InstOpCode::lis, node, tempReg, -32640);
+      generateTrg1Src1ImmInstruction(cg, TR::InstOpCode::ori, node, tempReg, tempReg, 0x8080);
       }
 
    generateLabelInstruction(cg, TR::InstOpCode::label, node, serialUnrollLabel);
@@ -11840,26 +11843,26 @@ static TR::Register *inlineStringCodingHasNegativesOrCountPositives(TR::Node *no
       {
       if (isLE)
          {
-         generateTrg1Src1ImmInstruction(cg, TR::InstOpCode::andi_r, node, maskReg, storeReg, 0x80);
+         generateTrg1Src1ImmInstruction(cg, TR::InstOpCode::andi_r, node, tempReg, storeReg, 0x80);
          generateConditionalBranchInstruction(cg, TR::InstOpCode::bne, node, endLabel, cr0);
 
          generateTrg1Src1ImmInstruction(cg, TR::InstOpCode::addi, node, indexReg, indexReg, 1);
-         generateTrg1Src1ImmInstruction(cg, TR::InstOpCode::andi_r, node, maskReg, storeReg, 0x8000);
+         generateTrg1Src1ImmInstruction(cg, TR::InstOpCode::andi_r, node, tempReg, storeReg, 0x8000);
          generateConditionalBranchInstruction(cg, TR::InstOpCode::bne, node, endLabel, cr0);
 
          generateTrg1Src1ImmInstruction(cg, TR::InstOpCode::addi, node, indexReg, indexReg, 1);
-         generateTrg1Src1ImmInstruction(cg, TR::InstOpCode::andis_r, node, maskReg, storeReg, 0x80);
+         generateTrg1Src1ImmInstruction(cg, TR::InstOpCode::andis_r, node, tempReg, storeReg, 0x80);
          generateConditionalBranchInstruction(cg, TR::InstOpCode::bne, node, endLabel, cr0);
 
          generateTrg1Src1ImmInstruction(cg, TR::InstOpCode::addi, node, indexReg, indexReg, 1);
-         generateTrg1Src1ImmInstruction(cg, TR::InstOpCode::andis_r, node, maskReg, storeReg, 0x8000);
+         generateTrg1Src1ImmInstruction(cg, TR::InstOpCode::andis_r, node, tempReg, storeReg, 0x8000);
          generateConditionalBranchInstruction(cg, TR::InstOpCode::bne, node, endLabel, cr0);
 
          generateTrg1Src1ImmInstruction(cg, TR::InstOpCode::addi, node, indexReg, indexReg, 1);
          }
       else
          {
-         generateTrg1Src2Instruction(cg, TR::InstOpCode::AND, node, storeReg, storeReg, maskReg);
+         generateTrg1Src2Instruction(cg, TR::InstOpCode::AND, node, storeReg, storeReg, tempReg);
          generateTrg1Src1Instruction(cg, TR::InstOpCode::cntlzw, node, storeReg, storeReg);
          generateTrg1Src1ImmInstruction(cg, TR::InstOpCode::srawi, node, storeReg, storeReg, 3);
          generateTrg1Src2Instruction(cg, TR::InstOpCode::add, node, indexReg, storeReg, indexReg);
@@ -11870,13 +11873,13 @@ static TR::Register *inlineStringCodingHasNegativesOrCountPositives(TR::Node *no
       }
    else
       {
-      generateTrg1Src2Instruction(cg, TR::InstOpCode::AND, node, storeReg, storeReg, maskReg);
+      generateTrg1Src2Instruction(cg, TR::InstOpCode::AND, node, storeReg, storeReg, tempReg);
       generateTrg1Src1ImmInstruction(cg, TR::InstOpCode::cmpi4, node, cr6, storeReg, 0);
       // this label happens to work
       generateConditionalBranchInstruction(cg, TR::InstOpCode::bne, node, matchLabel, cr6);
       generateTrg1Src1ImmInstruction(cg, TR::InstOpCode::addi, node, indexReg, indexReg, 4);
       }
-   generateLabelInstruction(cg, TR::InstOpCode::b, node, serialUnrollLabel);
+   generateConditionalBranchInstruction(cg, TR::InstOpCode::bdnz, node, serialUnrollLabel, cr6);
 
    generateLabelInstruction(cg, TR::InstOpCode::label, node, serialLabel);
    generateTrg1Src2Instruction(cg, TR::InstOpCode::cmp4, node, cr6, indexReg, lengthReg);
@@ -11908,7 +11911,7 @@ static TR::Register *inlineStringCodingHasNegativesOrCountPositives(TR::Node *no
    // end
 
    TR::RegisterDependencyConditions *deps =
-      new (cg->trHeapMemory()) TR::RegisterDependencyConditions(0, 11, cg->trMemory());
+      new (cg->trHeapMemory()) TR::RegisterDependencyConditions(0, 10, cg->trMemory());
 
    deps->addPostCondition(startReg, TR::RealRegister::NoReg);
    deps->getPostConditions()->getRegisterDependency(deps->getAddCursorForPost() - 1)->setExcludeGPR0();
@@ -11930,7 +11933,6 @@ static TR::Register *inlineStringCodingHasNegativesOrCountPositives(TR::Node *no
    deps->addPostCondition(vtmp2Reg, TR::RealRegister::NoReg);
 
    deps->addPostCondition(storeReg, TR::RealRegister::NoReg);
-   deps->addPostCondition(maskReg, TR::RealRegister::NoReg);
 
    generateDepLabelInstruction(cg, TR::InstOpCode::label, node, endLabel, deps);
 
@@ -11955,7 +11957,6 @@ static TR::Register *inlineStringCodingHasNegativesOrCountPositives(TR::Node *no
    cg->stopUsingRegister(vtmp2Reg);
 
    cg->stopUsingRegister(storeReg);
-   cg->stopUsingRegister(maskReg);
 
    for (int32_t i = 0; i < node->getNumChildren(); i++)
       {