From 6baeb8805cd69638ae7c5882826c15a1394a3b79 Mon Sep 17 00:00:00 2001 From: Stepan Dyatkovskiy Date: Fri, 20 Jun 2014 19:11:56 +0000 Subject: [PATCH] =?utf8?q?Commited=20patch=20from=20Bj=C3=B6rn=20Steinbrin?= =?utf8?q?k:=20Summary:=20Different=20range=20metadata=20can=20lead=20to?= =?utf8?q?=20different=20optimizations=20in=20later=20passes,=20possibly?= =?utf8?q?=20breaking=20the=20semantics=20of=20the=20merged=20function.=20?= =?utf8?q?So=20range=20metadata=20must=20be=20taken=20into=20consideration?= =?utf8?q?=20when=20comparing=20Load=20instructions.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Thanks! llvm-svn: 211391 --- llvm/lib/Transforms/IPO/MergeFunctions.cpp | 7 ++++- llvm/test/Transforms/MergeFunc/ranges.ll | 43 ++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 llvm/test/Transforms/MergeFunc/ranges.ll diff --git a/llvm/lib/Transforms/IPO/MergeFunctions.cpp b/llvm/lib/Transforms/IPO/MergeFunctions.cpp index c9b4af7..c66df60 100644 --- a/llvm/lib/Transforms/IPO/MergeFunctions.cpp +++ b/llvm/lib/Transforms/IPO/MergeFunctions.cpp @@ -325,6 +325,7 @@ private: /// 6.1.Load: volatile (as boolean flag) /// 6.2.Load: alignment (as integer numbers) /// 6.3.Load: synch-scope (as integer numbers) + /// 6.4.Load: range metadata (as integer numbers) /// On this stage its better to see the code, since its not more than 10-15 /// strings for particular instruction, and could change sometimes. int cmpOperation(const Instruction *L, const Instruction *R) const; @@ -788,7 +789,11 @@ int FunctionComparator::cmpOperation(const Instruction *L, if (int Res = cmpNumbers(LI->getOrdering(), cast(R)->getOrdering())) return Res; - return cmpNumbers(LI->getSynchScope(), cast(R)->getSynchScope()); + if (int Res = + cmpNumbers(LI->getSynchScope(), cast(R)->getSynchScope())) + return Res; + return cmpNumbers((uint64_t)LI->getMetadata(LLVMContext::MD_range), + (uint64_t)cast(R)->getMetadata(LLVMContext::MD_range)); } if (const StoreInst *SI = dyn_cast(L)) { if (int Res = diff --git a/llvm/test/Transforms/MergeFunc/ranges.ll b/llvm/test/Transforms/MergeFunc/ranges.ll new file mode 100644 index 0000000..e25ff1d --- /dev/null +++ b/llvm/test/Transforms/MergeFunc/ranges.ll @@ -0,0 +1,43 @@ +; RUN: opt -mergefunc -S < %s | FileCheck %s +define i1 @cmp_with_range(i8*, i8*) { + %v1 = load i8* %0, !range !0 + %v2 = load i8* %1, !range !0 + %out = icmp eq i8 %v1, %v2 + ret i1 %out +} + +define i1 @cmp_no_range(i8*, i8*) { +; CHECK-LABEL: @cmp_no_range +; CHECK-NEXT %v1 = load i8* %0 +; CHECK-NEXT %v2 = load i8* %1 +; CHECK-NEXT %out = icmp eq i8 %v1, %v2 +; CHECK-NEXT ret i1 %out + %v1 = load i8* %0 + %v2 = load i8* %1 + %out = icmp eq i8 %v1, %v2 + ret i1 %out +} + +define i1 @cmp_different_range(i8*, i8*) { +; CHECK-LABEL: @cmp_different_range +; CHECK-NEXT: %v1 = load i8* %0, !range !1 +; CHECK-NEXT: %v2 = load i8* %1, !range !1 +; CHECK-NEXT: %out = icmp eq i8 %v1, %v2 +; CHECK-NEXT: ret i1 %out + %v1 = load i8* %0, !range !1 + %v2 = load i8* %1, !range !1 + %out = icmp eq i8 %v1, %v2 + ret i1 %out +} + +define i1 @cmp_with_same_range(i8*, i8*) { +; CHECK-LABEL: @cmp_with_same_range +; CHECK: tail call i1 @cmp_with_range + %v1 = load i8* %0, !range !0 + %v2 = load i8* %1, !range !0 + %out = icmp eq i8 %v1, %v2 + ret i1 %out +} + +!0 = metadata !{i8 0, i8 2} +!1 = metadata !{i8 5, i8 7} -- 2.7.4