Skip to content

CSE OSSA: Enable lookThroughOwnershipInsts for some more instructions #35979

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

Merged
merged 1 commit into from
Feb 16, 2021
Merged

CSE OSSA: Enable lookThroughOwnershipInsts for some more instructions #35979

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
31 changes: 20 additions & 11 deletions lib/SILOptimizer/Transforms/CSE.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,8 @@ class HashVisitor : public SILInstructionVisitor<HashVisitor, llvm::hash_code> {
}

hash_code visitValueMetatypeInst(ValueMetatypeInst *X) {
return llvm::hash_combine(X->getKind(), X->getType(), X->getOperand());
return llvm::hash_combine(X->getKind(), X->getType(),
lookThroughOwnershipInsts(X->getOperand()));
}

hash_code visitExistentialMetatypeInst(ExistentialMetatypeInst *X) {
Expand Down Expand Up @@ -353,12 +354,14 @@ class HashVisitor : public SILInstructionVisitor<HashVisitor, llvm::hash_code> {
// We hash the enum by hashing its kind, element, and operand if it has one.
if (!X->hasOperand())
return llvm::hash_combine(X->getKind(), X->getElement());
return llvm::hash_combine(X->getKind(), X->getElement(), X->getOperand());
return llvm::hash_combine(X->getKind(), X->getElement(),
lookThroughOwnershipInsts(X->getOperand()));
}

hash_code visitUncheckedEnumDataInst(UncheckedEnumDataInst *X) {
// We hash the enum by hashing its kind, element, and operand.
return llvm::hash_combine(X->getKind(), X->getElement(), X->getOperand());
return llvm::hash_combine(X->getKind(), X->getElement(),
lookThroughOwnershipInsts(X->getOperand()));
}

hash_code visitIndexAddrInst(IndexAddrInst *X) {
Expand Down Expand Up @@ -389,11 +392,10 @@ class HashVisitor : public SILInstructionVisitor<HashVisitor, llvm::hash_code> {
}

hash_code visitSelectEnumInstBase(SelectEnumInstBase *X) {
auto hash = llvm::hash_combine(X->getKind(),
X->getEnumOperand(),
X->getType(),
X->hasDefault());

auto hash = llvm::hash_combine(
X->getKind(), lookThroughOwnershipInsts(X->getEnumOperand()),
X->getType(), X->hasDefault());

for (unsigned i = 0, e = X->getNumCases(); i < e; ++i) {
hash = llvm::hash_combine(hash, X->getCase(i).first,
X->getCase(i).second);
Expand All @@ -415,9 +417,8 @@ class HashVisitor : public SILInstructionVisitor<HashVisitor, llvm::hash_code> {

hash_code visitSelectValueInst(SelectValueInst *X) {
auto hash = llvm::hash_combine(X->getKind(),
X->getOperand(),
X->getType(),
X->hasDefault());
lookThroughOwnershipInsts(X->getOperand()),
X->getType(), X->hasDefault());

for (unsigned i = 0, e = X->getNumCases(); i < e; ++i) {
hash = llvm::hash_combine(hash, X->getCase(i).first,
Expand Down Expand Up @@ -452,6 +453,14 @@ class HashVisitor : public SILInstructionVisitor<HashVisitor, llvm::hash_code> {
}

hash_code visitMarkDependenceInst(MarkDependenceInst *X) {
if (X->getFunction()->hasOwnership()) {
auto TransformedOpValues =
X->getOperandValues(lookThroughOwnershipInsts, false);
return llvm::hash_combine(
X->getKind(), X->getType(),
llvm::hash_combine_range(TransformedOpValues.begin(),
TransformedOpValues.end()));
}
OperandValueArrayRef Operands(X->getAllOperands());
return llvm::hash_combine(
X->getKind(), X->getType(),
Expand Down
37 changes: 37 additions & 0 deletions test/SILOptimizer/cse_objc_ossa.sil
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,3 +325,40 @@ sil_vtable Bar {
#Bar.deinit!deallocator: @_TFC4test3BarD // test.Bar.__deallocating_deinit
}

// CHECK-LABEL: sil [ossa] @cse_value_metatype2 :
// CHECK: value_metatype $@objc_metatype
// CHECK: objc_metatype_to_object
// CHECK-NOT: value_metatype $@objc_metatype
// CHECK: destroy_value
// CHECK-LABEL: } // end sil function 'cse_value_metatype2'
sil [ossa] @cse_value_metatype2 : $@convention(thin) <T where T : AnyObject> (@owned T) -> @owned (AnyObject, AnyObject) {
bb0(%0 : @owned $T):
%2 = value_metatype $@objc_metatype T.Type, %0 : $T
%4 = objc_metatype_to_object %2 : $@objc_metatype T.Type to $AnyObject
%copy = copy_value %0 : $T
%5 = value_metatype $@objc_metatype T.Type, %copy : $T
%7 = objc_metatype_to_object %5 : $@objc_metatype T.Type to $AnyObject
destroy_value %0 : $T
destroy_value %copy : $T
%9 = tuple (%4: $AnyObject, %7: $AnyObject)
return %9 : $(AnyObject, AnyObject)
}

// CHECK-LABEL: sil [ossa] @cse_existential_metatype2 :
// CHECK: existential_metatype $@objc_metatype
// CHECK: objc_existential_metatype_to_object
// CHECK-NOT: existential_metatype $@objc_metatype
// CHECK: destroy_value
// CHECK-LABEL: } // end sil function 'cse_existential_metatype2'
sil [ossa] @cse_existential_metatype2 : $@convention(thin) (@owned XX) -> @owned (AnyObject, AnyObject) {
bb0(%0 : @owned $XX):
%2 = existential_metatype $@objc_metatype XX.Type, %0 : $XX
%4 = objc_existential_metatype_to_object %2 : $@objc_metatype XX.Type to $AnyObject
%copy = copy_value %0 : $XX
%5 = existential_metatype $@objc_metatype XX.Type, %copy : $XX
%6 = objc_existential_metatype_to_object %5 : $@objc_metatype XX.Type to $AnyObject
destroy_value %0 : $XX
destroy_value %copy : $XX
%7 = tuple (%4: $AnyObject, %6: $AnyObject)
return %7 : $(AnyObject, AnyObject)
}
15 changes: 15 additions & 0 deletions test/SILOptimizer/cse_ossa.sil
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1208,3 +1208,18 @@ bb0:
return %22 : $()
}

// CHECK-LABEL: sil [ossa] @cse_mark_dependence2 :
// CHECK: mark_dependence
// CHECK-NOT: mark_dependence
// CHECK-LABEL: } // end sil function 'cse_mark_dependence2'
sil [ossa] @cse_mark_dependence2 : $@convention(thin) (@inout Builtin.Int64, @guaranteed Builtin.NativeObject) -> (Builtin.Int64, Builtin.Int64) {
bb0(%0 : $*Builtin.Int64, %1 : @guaranteed $Builtin.NativeObject):
%2 = mark_dependence %0 : $*Builtin.Int64 on %1 : $Builtin.NativeObject
%copy = copy_value %1 : $Builtin.NativeObject
%3 = mark_dependence %0 : $*Builtin.Int64 on %copy : $Builtin.NativeObject
%4 = load [trivial] %2 : $*Builtin.Int64
%5 = load [trivial] %3 : $*Builtin.Int64
%6 = tuple(%4 : $Builtin.Int64, %5 : $Builtin.Int64)
destroy_value %copy : $Builtin.NativeObject
return %6 : $(Builtin.Int64, Builtin.Int64)
}
34 changes: 34 additions & 0 deletions test/SILOptimizer/cse_ossa_nontrivial.sil
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -796,3 +796,37 @@ bb3:
return %res : $()
}

// CHECK-LABEL: sil [ossa] @cse_select_enum2 :
// CHECK: select_enum
// CHECK-NOT: select_enum
// CHECK: tuple
// CHECK-LABEL: } // end sil function 'cse_select_enum2'
sil [ossa] @cse_select_enum2 : $@convention(thin) (@guaranteed FakeOptional) -> (Builtin.Int1, Builtin.Int1) {
bb0(%0 : @guaranteed $FakeOptional):
%t = integer_literal $Builtin.Int1, 1
%f = integer_literal $Builtin.Int1, 0
%1 = select_enum %0 : $FakeOptional, case #FakeOptional.none!enumelt: %t, case #FakeOptional.some!enumelt: %f : $Builtin.Int1
%copy = copy_value %0 : $FakeOptional
%2 = select_enum %copy : $FakeOptional, case #FakeOptional.none!enumelt: %t, case #FakeOptional.some!enumelt: %f : $Builtin.Int1
destroy_value %copy : $FakeOptional
%3 = tuple (%1: $Builtin.Int1, %2: $Builtin.Int1)
return %3: $(Builtin.Int1, Builtin.Int1)
}

// CHECK-LABEL: sil [ossa] @enum_cse2 :
// CHECK: enum $FakeOptional, #FakeOptional.some!enumelt
// CHECK-NOT: enum $FakeOptional, #FakeOptional.some!enumelt
// CHECK-LABEL: } // end sil function 'enum_cse2'
sil [ossa] @enum_cse2 : $@convention(thin) (@guaranteed Klass) -> () {
bb0(%0 : @guaranteed $Klass):
%func = function_ref @unknown_fake_optional_user : $@convention(thin) (FakeOptional) -> ()
%copy = copy_value %0 : $Klass
%4 = enum $FakeOptional, #FakeOptional.some!enumelt, %0 : $Klass
%5 = enum $FakeOptional, #FakeOptional.some!enumelt, %copy : $Klass
apply %func(%4) : $@convention(thin) (FakeOptional) -> ()
apply %func(%5) : $@convention(thin) (FakeOptional) -> ()
destroy_value %5 : $FakeOptional
%6 = tuple()
return %6 : $()
}