From 40e66efebe4f438f53d4b98d7e4a5aed7fdf5f36 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Mon, 23 Sep 2019 22:23:01 +0000 Subject: [PATCH] HotColdSplitting: invalidate the AssumptionCache on split When a cold path is outlined, the value tracking in the assumption cache may be invalidated due to the code motion. We would previously trip an assertion in subsequent passes (but required the passes to happen in a single run as the assumption cache is shared across the passes). Invalidating the cache ensures that we get the correct information when needed with the legacy pass manager as well. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@372667 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Transforms/IPO/HotColdSplitting.cpp | 5 +++ .../assumption-cache-invalidation.ll | 38 +++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 test/Transforms/HotColdSplit/assumption-cache-invalidation.ll diff --git a/lib/Transforms/IPO/HotColdSplitting.cpp b/lib/Transforms/IPO/HotColdSplitting.cpp index 79a5a9b80a9..49937a727fe 100644 --- a/lib/Transforms/IPO/HotColdSplitting.cpp +++ b/lib/Transforms/IPO/HotColdSplitting.cpp @@ -659,6 +659,11 @@ bool HotColdSplitting::outlineColdRegions(Function &F, bool HasProfileSummary) { } while (!Region.empty()); } + // We need to explicitly clear the assumption cache since the value tracking + // may now be invalid as part of the function has changed. + if (Changed) + if (AssumptionCache *AC = LookupAC(F)) + AC->clear(); return Changed; } diff --git a/test/Transforms/HotColdSplit/assumption-cache-invalidation.ll b/test/Transforms/HotColdSplit/assumption-cache-invalidation.ll new file mode 100644 index 00000000000..811b50783a5 --- /dev/null +++ b/test/Transforms/HotColdSplit/assumption-cache-invalidation.ll @@ -0,0 +1,38 @@ +; RUN: opt -instcombine -hotcoldsplit -instsimplify %s -o /dev/null + +target datalayout = "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128" +target triple = "aarch64" + +%a = type { i64, i64 } +%b = type { i64 } + +define void @f() { +entry: + %0 = getelementptr inbounds %a, %a* null, i64 0, i32 1 + br label %label + +label: + %1 = bitcast i64* %0 to %b** + %2 = load %b*, %b** %1, align 8 + %3 = getelementptr inbounds %b, %b* %2, i64 undef, i32 0 + %4 = load i64, i64* %3, align 8 + %5 = icmp ugt i64 %4, 1 + br i1 %5, label %if.then, label %if.else + +if.then: + unreachable + +if.else: + call void @g(i8* undef) + %6 = load i64, i64* undef, align 8 + %7 = and i64 %6, -16 + %8 = inttoptr i64 %7 to i8* + %9 = icmp eq i64 %4, 0 + call void @llvm.assume(i1 %9) + unreachable +} + +declare void @g(i8*) + +declare void @llvm.assume(i1) + -- 2.40.0