[llvm] [llvm-diff] Diff attributes & metadata (PR #129247)
via llvm-commits
llvm-commits at lists.llvm.org
Mon Mar 10 02:11:25 PDT 2025
https://github.com/aapanfilovv updated https://github.com/llvm/llvm-project/pull/129247
>From 3770f5e3e0078af336288cca2a17bc1277bc2c44 Mon Sep 17 00:00:00 2001
From: aapanfilovv <a.a.panfilovv at yandex.ru>
Date: Fri, 28 Feb 2025 16:59:57 +0300
Subject: [PATCH 1/2] diff attributes & metadata
---
llvm/tools/llvm-diff/lib/DifferenceEngine.cpp | 55 ++++++++++++++++++-
1 file changed, 53 insertions(+), 2 deletions(-)
diff --git a/llvm/tools/llvm-diff/lib/DifferenceEngine.cpp b/llvm/tools/llvm-diff/lib/DifferenceEngine.cpp
index 9be0eec7b73f3..64e673383b566 100644
--- a/llvm/tools/llvm-diff/lib/DifferenceEngine.cpp
+++ b/llvm/tools/llvm-diff/lib/DifferenceEngine.cpp
@@ -340,8 +340,32 @@ class FunctionDifferenceEngine {
BasicBlock::const_iterator RI);
bool diffCallSites(const CallBase &L, const CallBase &R, bool Complain) {
- // FIXME: call attributes
AssumptionContext AC = {L.getParent(), R.getParent()};
+ const AttributeList &LAttrs = L.getAttributes();
+ const AttributeList &RAttrs = R.getAttributes();
+ if (LAttrs.getFnAttrs() != RAttrs.getFnAttrs()) {
+ if (Complain)
+ Engine.log("function attributes differ");
+ return true;
+ }
+ if (LAttrs.getNumAttrSets() != RAttrs.getNumAttrSets()) {
+ if (Complain)
+ Engine.log("parameter attribute counts differ");
+ return true;
+ }
+ for (unsigned I = 0; I != LAttrs.getNumAttrSets(); I++) {
+ if (LAttrs.getParamAttrs(I) != RAttrs.getParamAttrs(I)) {
+ if (Complain)
+ Engine.logf("parameter attributes %l and %r differ")
+ << L.getArgOperand(I) << R.getArgOperand(I);
+ return true;
+ }
+ }
+ if (LAttrs.getRetAttrs() != RAttrs.getRetAttrs()) {
+ if (Complain)
+ Engine.log("return attributes differ");
+ return true;
+ }
if (!equivalentAsOperands(L.getCalledOperand(), R.getCalledOperand(),
&AC)) {
if (Complain) Engine.log("called functions differ");
@@ -366,7 +390,6 @@ class FunctionDifferenceEngine {
// assumption to be checked later in BlockDiffCandidates.
bool diff(const Instruction *L, const Instruction *R, bool Complain,
bool TryUnify, bool AllowAssumptions) {
- // FIXME: metadata (if Complain is set)
AssumptionContext ACValue = {L->getParent(), R->getParent()};
// nullptr AssumptionContext disables assumption generation.
const AssumptionContext *AC = AllowAssumptions ? &ACValue : nullptr;
@@ -377,6 +400,34 @@ class FunctionDifferenceEngine {
return true;
}
+ if (L->hasMetadata() || R->hasMetadata()) {
+ SmallVector<std::pair<unsigned, MDNode *>, 4> LMD, RMD;
+ L->getAllMetadata(LMD);
+ R->getAllMetadata(RMD);
+ if (LMD.size() != RMD.size()) {
+ if (Complain)
+ Engine.log("different metadata entry counts");
+ return true;
+ }
+ for (unsigned I = 0; I != LMD.size(); ++I) {
+ if (LMD[I].second->getNumOperands() !=
+ RMD[I].second->getNumOperands()) {
+ if (Complain)
+ Engine.log("different metadata operand counts");
+ return true;
+ }
+ for (unsigned J = 0; J != LMD[I].second->getNumOperands(); J++) {
+ Metadata *a = LMD[I].second->getOperand(J);
+ Metadata *b = RMD[I].second->getOperand(J);
+ if (a->getMetadataID() != b->getMetadataID()) {
+ if (Complain)
+ Engine.log("different metadata entry counts");
+ return true;
+ }
+ }
+ }
+ }
+
if (isa<CmpInst>(L)) {
if (cast<CmpInst>(L)->getPredicate()
!= cast<CmpInst>(R)->getPredicate()) {
>From 5252d389b562209731cc63d764fccac9b3de4159 Mon Sep 17 00:00:00 2001
From: aapanfilovv <a.a.panfilovv at yandex.ru>
Date: Mon, 10 Mar 2025 12:10:52 +0300
Subject: [PATCH 2/2] [llvm-diff] Add tests for attributes & metadata diff
---
llvm/test/tools/llvm-diff/call-attributes.ll | 53 +++++++++++++++++++
.../tools/llvm-diff/instruction-metadata.ll | 18 +++++++
2 files changed, 71 insertions(+)
create mode 100644 llvm/test/tools/llvm-diff/call-attributes.ll
create mode 100644 llvm/test/tools/llvm-diff/instruction-metadata.ll
diff --git a/llvm/test/tools/llvm-diff/call-attributes.ll b/llvm/test/tools/llvm-diff/call-attributes.ll
new file mode 100644
index 0000000000000..8d0efac889c3f
--- /dev/null
+++ b/llvm/test/tools/llvm-diff/call-attributes.ll
@@ -0,0 +1,53 @@
+; RUN: rm -f %t.ll
+; RUN: cat %s | sed -e 's/zeroext/signext/' -e 's/noundef/noalias/' -e 's/nounwind/nosync/' > %t.ll
+; RUN: not llvm-diff %s %t.ll 2>&1 | FileCheck %s
+; CHECK:in function return:
+; CHECK: in block %entry:
+; CHECK: > %1 = call signext i32 @foo(ptr %0)
+; CHECK: > ret i32 %1
+; CHECK: < %1 = call zeroext i32 @foo(ptr %0)
+; CHECK: < ret i32 %1
+; CHECK:in function param:
+; CHECK: in block %entry:
+; CHECK: > %1 = call i32 @foo(ptr noalias %0)
+; CHECK: > ret i32 %1
+; CHECK: < %1 = call i32 @foo(ptr noundef %0)
+; CHECK: < ret i32 %1
+; CHECK:in function function:
+; CHECK: in block %entry:
+; CHECK: > %1 = call i32 @foo(ptr %0) #0
+; CHECK: > ret i32 %1
+; CHECK: < %1 = call i32 @foo(ptr %0) #0
+; CHECK: < ret i32 %1
+; CHECK:in function all_possible:
+; CHECK: in block %entry:
+; CHECK: > %1 = call signext i32 @foo(ptr noalias %0) #0
+; CHECK: > ret i32 %1
+; CHECK: < %1 = call zeroext i32 @foo(ptr noundef %0) #0
+; CHECK: < ret i32 %1
+
+declare i32 @foo(ptr)
+
+define i32 @return(ptr %0) {
+entry:
+ %1 = call zeroext i32 @foo(ptr %0)
+ ret i32 %1
+}
+
+define i32 @param(ptr %0) {
+entry:
+ %1 = call i32 @foo(ptr noundef %0)
+ ret i32 %1
+}
+
+define i32 @function(ptr %0) {
+entry:
+ %1 = call i32 @foo(ptr %0) nounwind
+ ret i32 %1
+}
+
+define i32 @all_possible(ptr %0) {
+entry:
+ %1 = call zeroext i32 @foo(ptr noundef %0) nounwind
+ ret i32 %1
+}
\ No newline at end of file
diff --git a/llvm/test/tools/llvm-diff/instruction-metadata.ll b/llvm/test/tools/llvm-diff/instruction-metadata.ll
new file mode 100644
index 0000000000000..fcd50fe72a431
--- /dev/null
+++ b/llvm/test/tools/llvm-diff/instruction-metadata.ll
@@ -0,0 +1,18 @@
+; RUN: rm -f %t.ll
+; RUN: cat %s | sed -e 's/!range !0/!range !1/' > %t.ll
+; RUN: not llvm-diff %s %t.ll 2>&1 | FileCheck %s
+; CHECK:in function foo:
+; CHECK: in block %entry:
+; CHECK: > %sum = add i32 %a, %b, !range !0
+; CHECK: > ret i32 %sum
+; CHECK: < %sum = add i32 %a, %b, !range !0
+; CHECK: < ret i32 %sum
+
+define i32 @foo(i32 %a, i32 %b) {
+entry:
+ %sum = add i32 %a, %b, !range !0
+ ret i32 %sum
+}
+
+!0 = !{i32 0, i32 2147483647}
+!1 = !{}
More information about the llvm-commits
mailing list