From 6cf6f7dc96d55af63a15fb73499bf81d00f969b3 Mon Sep 17 00:00:00 2001 From: David Herzka Date: Wed, 25 Dec 2019 19:52:17 -0500 Subject: [PATCH] Revert "Make lazyload_metadata.ll resilient to the addition of new metadata kinds" This reverts commit 2e6c15d1e7a47f11fab2dd3a40fcff01906923ae. It causes the test to fail on Windows --- llvm/test/ThinLTO/X86/lazyload_metadata.ll | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/llvm/test/ThinLTO/X86/lazyload_metadata.ll b/llvm/test/ThinLTO/X86/lazyload_metadata.ll index 3895b9faad10..79c377724efa 100644 --- a/llvm/test/ThinLTO/X86/lazyload_metadata.ll +++ b/llvm/test/ThinLTO/X86/lazyload_metadata.ll @@ -7,19 +7,18 @@ ; Check that importing @globalfunc1 does not trigger loading all the global ; metadata for @globalfunc2 and @globalfunc3 -; RUN: (llvm-lto -thinlto-action=import %t2.bc -thinlto-index=%t3.bc -stats 2>&1 \ -; RUN: | awk '{print "LAZY: " $0}' && \ -; RUN: llvm-lto -thinlto-action=import %t2.bc -thinlto-index=%t3.bc -stats -disable-ondemand-mds-loading 2>&1 \ -; RUN: | awk '{print "NOTLAZY: " $0}') \ -; RUN: | FileCheck %s +; RUN: llvm-lto -thinlto-action=import %t2.bc -thinlto-index=%t3.bc \ +; RUN: -o /dev/null -stats \ +; RUN: 2>&1 | FileCheck %s -check-prefix=LAZY +; LAZY: 65 bitcode-reader - Number of Metadata records loaded +; LAZY: 2 bitcode-reader - Number of MDStrings loaded -; Check llvm-lto call with lazy loading enabled -; CHECK: LAZY: [[#LAZY_RECORDS:]] bitcode-reader - Number of Metadata records loaded -; CHECK: LAZY: 2 bitcode-reader - Number of MDStrings loaded +; RUN: llvm-lto -thinlto-action=import %t2.bc -thinlto-index=%t3.bc \ +; RUN: -o /dev/null -disable-ondemand-mds-loading -stats \ +; RUN: 2>&1 | FileCheck %s -check-prefix=NOTLAZY +; NOTLAZY: 74 bitcode-reader - Number of Metadata records loaded +; NOTLAZY: 7 bitcode-reader - Number of MDStrings loaded -; Check llvm-lto call with lazy loading disabled -; CHECK: NOTLAZY: [[#LAZY_RECORDS+9]] bitcode-reader - Number of Metadata records loaded -; CHECK: NOTLAZY: 7 bitcode-reader - Number of MDStrings loaded target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-apple-macosx10.11.0"