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

Optimize annotated array fields #7468

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

Optimize annotated array fields #7468

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: 7 additions & 5 deletions compiler/optimizer/OMRValuePropagation.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ namespace TR { class VPNonNullObject; }
namespace TR { class VPNullObject; }
namespace TR { class VPPreexistentObject; }
namespace TR { class VPUnreachablePath; }
namespace TR { class VPUnspecifiedArrayType; }
class TR_ValueNumberInfo;
namespace OMR { class ValuePropagation; }
class TR_VirtualGuard;
Expand Down Expand Up @@ -927,11 +928,12 @@ class ValuePropagation : public TR::Optimization

// Cached constraints
//
TR::VPNullObject *_nullObjectConstraint;
TR::VPNonNullObject *_nonNullObjectConstraint;
TR::VPPreexistentObject *_preexistentObjectConstraint;
TR::VPIntConst *_constantZeroConstraint;
TR::VPUnreachablePath *_unreachablePathConstraint;
TR::VPNullObject *_nullObjectConstraint;
TR::VPNonNullObject *_nonNullObjectConstraint;
TR::VPPreexistentObject *_preexistentObjectConstraint;
TR::VPIntConst *_constantZeroConstraint;
TR::VPUnreachablePath *_unreachablePathConstraint;
TR::VPUnspecifiedArrayType *_unspecifiedArrayTypeConstraint;

TR_UseDefInfo *_useDefInfo; // Cached use/def info
TR_ValueNumberInfo *_valueNumberInfo; // Cached value number info
Expand Down
102 changes: 85 additions & 17 deletions compiler/optimizer/VPConstraint.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ TR::VPConstString *TR::VPConstraint::asConstString() { return NULL;
TR::VPKnownObject *TR::VPConstraint::asKnownObject() { return NULL; }
TR::VPUnresolvedClass *TR::VPConstraint::asUnresolvedClass() { return NULL; }
TR::VPClassPresence *TR::VPConstraint::asClassPresence() { return NULL; }
TR::VPUnspecifiedArrayType *TR::VPConstraint::asUnspecifiedArrayType() { return NULL; }
TR::VPNullObject *TR::VPConstraint::asNullObject() { return NULL; }
TR::VPNonNullObject *TR::VPConstraint::asNonNullObject() { return NULL; }
TR::VPPreexistentObject *TR::VPConstraint::asPreexistentObject() { return NULL; }
Expand Down Expand Up @@ -112,6 +113,7 @@ TR::VPConstString *TR::VPConstString::asConstString() { return
TR::VPKnownObject *TR::VPKnownObject::asKnownObject() { return this; }
TR::VPUnresolvedClass *TR::VPUnresolvedClass::asUnresolvedClass() { return this; }
TR::VPClassPresence *TR::VPClassPresence::asClassPresence() { return this; }
TR::VPUnspecifiedArrayType *TR::VPUnspecifiedArrayType::asUnspecifiedArrayType() { return this; }
TR::VPNullObject *TR::VPNullObject::asNullObject() { return this; }
TR::VPNonNullObject *TR::VPNonNullObject::asNonNullObject() { return this; }
TR::VPPreexistentObject *TR::VPPreexistentObject::asPreexistentObject() { return this; }
Expand Down Expand Up @@ -247,6 +249,11 @@ bool TR::VPConstraint::isConstString()
return false;
}

bool TR::VPConstraint::isUnspecifiedArrayType()
{
return false;
}

// VP_SPECIALKLASS is created so that any type that
// intersects with it results in a null type. It is
// not meant to be propagated during the analysis
Expand Down Expand Up @@ -303,6 +310,11 @@ TR::VPConstString *TR::VPConstraint::getConstString()
return NULL;
}

TR::VPUnspecifiedArrayType *TR::VPConstraint::getUnspecifiedArrayType()
{
return NULL;
}

const char *TR::VPConstraint::getClassSignature(int32_t &len)
{
return NULL;
Expand Down Expand Up @@ -473,6 +485,11 @@ bool TR::VPClass::isConstString()
return false;
}

bool TR::VPClass::isUnspecifiedArrayType()
{
return _unspecifiedArrayType != NULL;
}

TR_YesNoMaybe TR::VPClass::isStackObject()
{
if (_location)
Expand Down Expand Up @@ -555,6 +572,11 @@ TR::VPConstString *TR::VPClass::getConstString()
return _type? _type->asConstString() : NULL;
}

TR::VPUnspecifiedArrayType *TR::VPClass::getUnspecifiedArrayType()
{
return _unspecifiedArrayType? _unspecifiedArrayType->asUnspecifiedArrayType() : NULL;
}

TR::VPClassType *TR::VPClassType::getClassType()
{
return this;
Expand Down Expand Up @@ -799,6 +821,11 @@ bool TR::VPNonNullObject::isNonNullObject()
return true;
}

bool TR::VPUnspecifiedArrayType::isUnspecifiedArrayType()
{
return true;
}

bool TR::VPPreexistentObject::isPreexistentObject()
{
return true;
Expand Down Expand Up @@ -1134,7 +1161,8 @@ TR::VPLongConstraint *TR::VPLongRange::create(OMR::ValuePropagation *vp, int64_t
}

TR::VPConstraint *TR::VPClass::create(OMR::ValuePropagation *vp, TR::VPClassType *type, TR::VPClassPresence *presence,
TR::VPPreexistentObject *preexistence, TR::VPArrayInfo *arrayInfo, TR::VPObjectLocation *location, TR_OpaqueClassBlock *typeHintClass)
TR::VPPreexistentObject *preexistence, TR::VPArrayInfo *arrayInfo, TR::VPObjectLocation *location, TR_OpaqueClassBlock *typeHintClass,
TR::VPUnspecifiedArrayType *unspecifiedArrayType)
{
// We shouldn't create a class constraint that contains the "null" constraint
// since null objects are not typed.
Expand Down Expand Up @@ -1212,27 +1240,33 @@ TR::VPConstraint *TR::VPClass::create(OMR::ValuePropagation *vp, TR::VPClassType
// If the constraint does not already exist, create it
//
int32_t hash = (((int32_t)(intptr_t)type)>>2) + (((int32_t)(intptr_t)presence)>>2) + (((int32_t)(intptr_t)preexistence)>>2) +
(((int32_t)(intptr_t)arrayInfo)>>2) + (((int32_t)(intptr_t)location)>>2) + (((int32_t)(intptr_t)typeHintClass)>>2);
(((int32_t)(intptr_t)arrayInfo)>>2) + (((int32_t)(intptr_t)location)>>2) + (((int32_t)(intptr_t)typeHintClass)>>2) + (((int32_t)(intptr_t)unspecifiedArrayType)>>2);
hash = ((uint32_t)hash) % VP_HASH_TABLE_SIZE;
TR::VPClass *constraint;
OMR::ValuePropagation::ConstraintsHashTableEntry *entry;
for (entry = vp->_constraintsHashTable[hash]; entry; entry = entry->next)
{
constraint = entry->constraint->asClass();
if (constraint &&
constraint->_type == type &&
constraint->_typeHintClass== typeHintClass &&
constraint->_presence == presence &&
constraint->_preexistence == preexistence &&
constraint->_arrayInfo == arrayInfo &&
constraint->_location == location)
constraint->_type == type &&
constraint->_typeHintClass == typeHintClass &&
constraint->_presence == presence &&
constraint->_preexistence == preexistence &&
constraint->_arrayInfo == arrayInfo &&
constraint->_location == location &&
constraint->_unspecifiedArrayType == unspecifiedArrayType)
return constraint;
}
constraint = new (vp->trStackMemory()) TR::VPClass(type, presence, preexistence, arrayInfo, location, typeHintClass);
constraint = new (vp->trStackMemory()) TR::VPClass(type, presence, preexistence, arrayInfo, location, typeHintClass, unspecifiedArrayType);
vp->addConstraint(constraint, hash);
return constraint;
}

TR::VPUnspecifiedArrayType *TR::VPUnspecifiedArrayType::create(OMR::ValuePropagation *vp)
{
return vp->_unspecifiedArrayTypeConstraint;
}

TR::VPClassType *TR::VPClassType::create(OMR::ValuePropagation *vp, TR::SymbolReference *symRef, bool isFixedClass, bool isPointerToClass)
{
if (!symRef->isUnresolved())
Expand Down Expand Up @@ -3266,11 +3300,12 @@ TR::VPConstraint *TR::VPClass::intersect1(TR::VPConstraint *other, OMR::ValuePro
{
TRACER(vp, this, other);

TR::VPClassType *type = _type;
TR::VPClassPresence *presence = _presence;
TR::VPPreexistentObject *preexistence = _preexistence;
TR::VPArrayInfo *arrayInfo = _arrayInfo;
TR::VPObjectLocation *location = _location;
TR::VPClassType *type = _type;
TR::VPClassPresence *presence = _presence;
TR::VPPreexistentObject *preexistence = _preexistence;
TR::VPArrayInfo *arrayInfo = _arrayInfo;
TR::VPObjectLocation *location = _location;
TR::VPUnspecifiedArrayType *unspecifiedArrayType = _unspecifiedArrayType;

const bool thisClassObjectYes = isClassObject() == TR_yes;
const bool otherClassObjectYes = other->isClassObject() == TR_yes;
Expand Down Expand Up @@ -3312,6 +3347,8 @@ TR::VPConstraint *TR::VPClass::intersect1(TR::VPConstraint *other, OMR::ValuePro
presence = NULL;
if (isNonNullObject() || other->isNonNullObject())
presence = TR::VPNonNullObject::create(vp);
if (isUnspecifiedArrayType() || other->isUnspecifiedArrayType())
unspecifiedArrayType = TR::VPUnspecifiedArrayType::create(vp);
}
else if (other->asClass())
{
Expand Down Expand Up @@ -3481,14 +3518,21 @@ TR::VPConstraint *TR::VPClass::intersect1(TR::VPConstraint *other, OMR::ValuePro
else
location = otherInfo;
}
else if (other->asUnspecifiedArrayType())
{
TR::VPUnspecifiedArrayType *otherUnspecifiedArrayType = other->asUnspecifiedArrayType();
//unspecifiedArrayType = unspecifiedArrayType ? (TR::VPUnspecifiedArrayType *)unspecifiedArrayType->intersect(otherUnspecifiedArrayType, vp) : otherUnspecifiedArrayType;
if (!unspecifiedArrayType)
unspecifiedArrayType = otherUnspecifiedArrayType;
}
else
return NULL;

TR_OpaqueClassBlock *otherTypeHintClass = other->getTypeHintClass();
TR_OpaqueClassBlock *typeHintClass = intersectTypeHintClasses(_typeHintClass, otherTypeHintClass, vp);

if (type || presence || preexistence || arrayInfo || location || typeHintClass)
return TR::VPClass::create(vp, type, presence, preexistence, arrayInfo, location, typeHintClass);
if (type || presence || preexistence || arrayInfo || location || typeHintClass || unspecifiedArrayType)
return TR::VPClass::create(vp, type, presence, preexistence, arrayInfo, location, typeHintClass, unspecifiedArrayType);
return NULL;
}

Expand Down Expand Up @@ -5251,18 +5295,32 @@ bool TR::VPClass::mustBeNotEqual(TR::VPConstraint *other, OMR::ValuePropagation
// Only one is a fixed-type constraint (or we'd have returned above).
TR_OpaqueClassBlock *fixedClass = NULL;
TR_OpaqueClassBlock *boundClass = NULL;
TR::VPConstraint *fixedConstraint = NULL;
TR::VPConstraint *boundConstraint = NULL;
if (thisIsFixedClass)
{
fixedClass = thisClass;
boundClass = otherClass;
fixedConstraint = this;
boundConstraint = other;
}
else
{
fixedClass = otherClass;
boundClass = thisClass;
fixedConstraint = other;
boundConstraint = this;
}

return vp->fe()->isInstanceOf(fixedClass, boundClass, true, true) == TR_no;
TR_YesNoMaybe fixedIsInstanceOfBound = vp->fe()->isInstanceOf(fixedClass, boundClass, true, true);
if (fixedIsInstanceOfBound == TR_no)
return true;

static bool enableUnspecifiedArrayOpt = feGetEnv("TR_mustNotBeEqualVPUnspecifiedArrayType") != NULL;
if (boundConstraint->isUnspecifiedArrayType())
return !fixedConstraint->getClassType()->isPrimitiveArray(vp->comp()) && !fixedConstraint->getClassType()->isReferenceArray(vp->comp()) && enableUnspecifiedArrayOpt;

return false;
}

// Neither type is fixed.
Expand Down Expand Up @@ -6073,6 +6131,8 @@ void TR::VPClass::print(TR::Compilation *comp, TR::FILE *outFile)
_arrayInfo->print(comp, outFile);
if (_location)
_location->print(comp, outFile);
if (_unspecifiedArrayType)
_unspecifiedArrayType->print(comp, outFile);
}

void TR::VPResolvedClass::print(TR::Compilation *comp, TR::FILE *outFile)
Expand Down Expand Up @@ -6156,6 +6216,13 @@ void TR::VPUnresolvedClass::print(TR::Compilation *comp, TR::FILE *outFile)
trfprintf(outFile, "unresolved class %.*s in method %.*s", _len, _sig, methodLen, methodName);
}

void TR::VPUnspecifiedArrayType::print(TR::Compilation *comp, TR::FILE *outFile)
{
if (outFile == NULL)
return;
trfprintf(outFile, " unspecified-array-type");
}

void TR::VPNullObject::print(TR::Compilation *comp, TR::FILE *outFile)
{
if (outFile == NULL)
Expand Down Expand Up @@ -6341,6 +6408,7 @@ const char *TR::VPResolvedClass::name() { return "ResolvedClass";
const char *TR::VPFixedClass::name() { return "FixedClass"; }
const char *TR::VPConstString::name() { return "ConstString"; }
const char *TR::VPUnresolvedClass::name() { return "UnresolvedClass"; }
const char *TR::VPUnspecifiedArrayType::name() { return "UnspecifiedArrayType"; }
const char *TR::VPNullObject::name() { return "NullObject"; }
const char *TR::VPNonNullObject::name() { return "NonNullObject"; }
const char *TR::VPPreexistentObject::name() { return "PreexistentObject"; }
Expand Down
35 changes: 27 additions & 8 deletions compiler/optimizer/VPConstraint.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ class VPConstraint
virtual class VPUnresolvedClass *asUnresolvedClass();
//virtual class TR::VPImplementedInterface *asImplementedInterface();
virtual class VPClassPresence *asClassPresence();
virtual class VPUnspecifiedArrayType *asUnspecifiedArrayType();
virtual class VPNullObject *asNullObject();
virtual class VPNonNullObject *asNonNullObject();
virtual class VPPreexistentObject *asPreexistentObject();
Expand Down Expand Up @@ -169,13 +170,15 @@ class VPConstraint
virtual TR_OpaqueClassBlock *getTypeHintClass();
virtual bool isFixedClass();
virtual bool isConstString();
virtual bool isUnspecifiedArrayType();
virtual TR::VPClassType *getClassType();
virtual TR::VPClassPresence *getClassPresence();
virtual TR::VPPreexistentObject *getPreexistence();
virtual TR::VPObjectLocation *getObjectLocation();
virtual TR::VPConstString *getConstString();
virtual TR::VPKnownObject *getKnownObject();
virtual TR::VPArrayInfo *getArrayInfo();
virtual TR::VPUnspecifiedArrayType *getUnspecifiedArrayType();
virtual const char *getClassSignature(int32_t &len);

virtual TR_YesNoMaybe isStackObject();
Expand Down Expand Up @@ -504,12 +507,14 @@ class VPClass : public TR::VPConstraint
{
public:
VPClass(TR::VPClassType *type, TR::VPClassPresence *presence, TR::VPPreexistentObject *preexistence,
TR::VPArrayInfo *arrayInfo, TR::VPObjectLocation *location, TR_OpaqueClassBlock *typeHintClass=NULL)
TR::VPArrayInfo *arrayInfo, TR::VPObjectLocation *location, TR_OpaqueClassBlock *typeHintClass = NULL,
TR::VPUnspecifiedArrayType *unspecifiedArrayType = NULL)
: TR::VPConstraint(ClassPriority), _type(type), _typeHintClass(typeHintClass), _presence(presence),
_preexistence(preexistence), _arrayInfo(arrayInfo), _location(location)
_preexistence(preexistence), _arrayInfo(arrayInfo), _location(location), _unspecifiedArrayType(unspecifiedArrayType)
{}
static TR::VPConstraint *create(OMR::ValuePropagation *vp, TR::VPClassType *type, TR::VPClassPresence *presence, TR::VPPreexistentObject *preexistence,
TR::VPArrayInfo *arrayInfo, TR::VPObjectLocation *location, TR_OpaqueClassBlock *typeHintClass = NULL);
TR::VPArrayInfo *arrayInfo, TR::VPObjectLocation *location,
TR_OpaqueClassBlock *typeHintClass = NULL, TR::VPUnspecifiedArrayType *unspecifiedArrayType = NULL);
virtual TR::VPClass *asClass();

virtual TR::VPConstraint *merge1(TR::VPConstraint *other, OMR::ValuePropagation *vp);
Expand All @@ -524,6 +529,7 @@ class VPClass : public TR::VPConstraint
virtual TR_OpaqueClassBlock *getClass();
virtual bool isFixedClass();
virtual bool isConstString();
virtual bool isUnspecifiedArrayType();
virtual TR::VPClassType *getClassType();
virtual TR_OpaqueClassBlock *getTypeHintClass();
virtual TR::VPArrayInfo *getArrayInfo();
Expand All @@ -532,6 +538,7 @@ class VPClass : public TR::VPConstraint
virtual TR::VPObjectLocation *getObjectLocation();
virtual TR::VPConstString *getConstString();
virtual TR::VPKnownObject *getKnownObject();
virtual TR::VPUnspecifiedArrayType *getUnspecifiedArrayType();

virtual TR_YesNoMaybe isStackObject();
virtual TR_YesNoMaybe isHeapObject();
Expand All @@ -554,11 +561,12 @@ class VPClass : public TR::VPConstraint
*
* _typeHintClass is the intersect of the initial typeHintClass and _type._typeHintClass if _type exists
*/
TR_OpaqueClassBlock *_typeHintClass;
TR::VPClassPresence *_presence;
TR::VPPreexistentObject *_preexistence;
TR::VPArrayInfo *_arrayInfo;
TR::VPObjectLocation *_location;
TR_OpaqueClassBlock *_typeHintClass;
TR::VPClassPresence *_presence;
TR::VPPreexistentObject *_preexistence;
TR::VPArrayInfo *_arrayInfo;
TR::VPObjectLocation *_location;
TR::VPUnspecifiedArrayType *_unspecifiedArrayType;
};

class VPClassType : public TR::VPConstraint
Expand Down Expand Up @@ -716,6 +724,17 @@ class VPUnresolvedClass : public TR::VPClassType
bool _definiteType;
};

class VPUnspecifiedArrayType : public TR::VPConstraint
{
public:
VPUnspecifiedArrayType() : TR::VPConstraint(UnresolvedClassPriority) {}
static TR::VPUnspecifiedArrayType *create(OMR::ValuePropagation *vp);
virtual const char *name();
virtual TR::VPUnspecifiedArrayType *asUnspecifiedArrayType();
virtual bool isUnspecifiedArrayType();
virtual void print(TR::Compilation *, TR::FILE *);
};

class VPClassPresence : public TR::VPConstraint
{
public:
Expand Down
Loading
Loading