Merge pull request #4303 from knn-k/aarch64eval53

AArch64: Generate VFTMask in aloadEvaluator()
eclipse-openj9 · Sep 15, 2019 · 2329e25 · 2329e25
2 parents 265676a + 99a003b
commit 2329e25
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/compiler/aarch64/codegen/OMRTreeEvaluator.cpp b/compiler/aarch64/codegen/OMRTreeEvaluator.cpp
@@ -261,6 +261,11 @@ OMR::ARM64::TreeEvaluator::aloadEvaluator(TR::Node *node, TR::CodeGenerator *cg)
    TR::MemoryReference *tempMR = new (cg->trHeapMemory()) TR::MemoryReference(node, 8, cg);
    generateTrg1MemInstruction(cg, TR::InstOpCode::ldrimmx, node, tempReg, tempMR);
 
+   if (node->getSymbolReference() == comp->getSymRefTab()->findVftSymbolRef())
+      {
+      TR::TreeEvaluator::generateVFTMaskInstruction(cg, node, tempReg);
+      }
+
    bool needSync = (node->getSymbolReference()->getSymbol()->isSyncVolatile() && TR::Compiler->target.isSMP());
    if (needSync)
       {
@@ -700,3 +705,17 @@ OMR::ARM64::TreeEvaluator::passThroughEvaluator(TR::Node *node, TR::CodeGenerato
    node->setRegister(trgReg);
    return trgReg;
    }
+
+TR::Instruction *
+OMR::ARM64::TreeEvaluator::generateVFTMaskInstruction(TR::CodeGenerator *cg, TR::Node *node, TR::Register *dstReg, TR::Register *srcReg, TR::Instruction *preced)
+   {
+   // Do nothing in OMR
+   return preced;
+   }
+
+TR::Instruction *
+OMR::ARM64::TreeEvaluator::generateVFTMaskInstruction(TR::CodeGenerator *cg, TR::Node *node, TR::Register *reg, TR::Instruction *preced)
+   {
+   // Do nothing in OMR
+   return preced;
+   }
diff --git a/compiler/aarch64/codegen/OMRTreeEvaluator.hpp b/compiler/aarch64/codegen/OMRTreeEvaluator.hpp
@@ -801,6 +801,9 @@ class OMR_EXTENSIBLE TreeEvaluator: public OMR::TreeEvaluator
 	static TR::Register *ibitpermuteEvaluator(TR::Node *node, TR::CodeGenerator *cg);
 	static TR::Register *lbitpermuteEvaluator(TR::Node *node, TR::CodeGenerator *cg);
 	static TR::Register *PrefetchEvaluator(TR::Node *node, TR::CodeGenerator *cg);
+
+	static TR::Instruction *generateVFTMaskInstruction(TR::CodeGenerator *cg, TR::Node *node, TR::Register *dstReg, TR::Register *srcReg, TR::Instruction *preced=NULL);
+	static TR::Instruction *generateVFTMaskInstruction(TR::CodeGenerator *cg, TR::Node *node, TR::Register *reg, TR::Instruction *preced=NULL);
    };
 
 }