also check FeatureBit equality

Author: chavandres

llvm/lib/Target/SystemZ/SystemZTargetTransformInfo.cpp

@@ -431,8 +431,9 @@ bool SystemZTTIImpl::areInlineCompatible(const Function *Caller,
   const FeatureBitset &CalleeBits =
       TM.getSubtargetImpl(*Callee)->getFeatureBits();
 
-  // Check that targets features from the callee are subset of the caller's.
-  return CalleeBits < CallerBits;
+  // Check that target features from the callee are subset or
+  // equal to the caller's features.
+  return (CalleeBits == CallerBits) || (CalleeBits < CallerBits);
 }
 
 unsigned SystemZTTIImpl::getNumberOfRegisters(unsigned ClassID) const {

llvm/test/Transforms/Inline/SystemZ/inline-target-attr.ll

@@ -1,6 +1,5 @@
-; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --tool ../build/bin/opt --version 5
-; RUN: opt < %s -mtriple=s390x-ibm-linux -S -passes=inline | FileCheck %s
-; RUN: opt < %s -mtriple=s390x-ibm-linux -S -passes='cgscc(inline)' | FileCheck %s
+; RUN: opt < %s -mtriple=s390x-linux-gnu -S -passes=inline | FileCheck %s
+; RUN: opt < %s -mtriple=s390x-linux-gnu -S -passes='cgscc(inline)' | FileCheck %s
 ; Check that we only inline when we have compatible target attributes.
 
 define i32 @foo() #0 {
@@ -29,5 +28,23 @@ entry:
 ; CHECK: call i32 @bar()
 }
 
-attributes #0 = { "target-cpu"="z13" }
-attributes #1 = { "target-cpu"="z14" }
+define i32 @quux() #2 {
+entry:
+  %call = call i32 @bar()
+  ret i32 %call
+; CHECK-LABEL: quux
+; CHECK: call i32 (...) @baz()
+}
+
+define i32 @foobar() #1 {
+entry:
+  %call = call i32 @bar()
+  ret i32 %call
+; CHECK-LABEL: foobar
+; CHECK: call i32 (...) @baz()
+}
+
+
+attributes #0 = { "target-cpu"="generic" "target-features"="+guarded-storage" }
+attributes #1 = { "target-cpu"="generic" "target-features"="+guarded-storage,+enhanced-sort" }
+attributes #2 = { "target-cpu"="generic" "target-features"="+concurrent-functions" }