From df5576a852088337e03970641db291c6799afe97 Mon Sep 17 00:00:00 2001 From: Arthur Eubanks Date: Tue, 25 Aug 2020 10:59:12 -0700 Subject: [PATCH] [test] Add -inject-tli-mapping to -loop-vectorize -vector-library tests The legacy LoopVectorize has a dependency on InjectTLIMappingsLegacy. That cannot be expressed in the new PM since they are both normal passes. Explicitly add -inject-tli-mappings as a pass. Follow-up to https://reviews.llvm.org/D86492. Reviewed By: spatel Differential Revision: https://reviews.llvm.org/D86561 --- llvm/test/Transforms/LoopVectorize/PowerPC/massv-altivec.ll | 2 +- llvm/test/Transforms/LoopVectorize/PowerPC/massv-calls.ll | 2 +- llvm/test/Transforms/LoopVectorize/PowerPC/massv-nobuiltin.ll | 2 +- llvm/test/Transforms/LoopVectorize/PowerPC/massv-unsupported.ll | 2 +- llvm/test/Transforms/LoopVectorize/PowerPC/widened-massv-call.ll | 2 +- llvm/test/Transforms/LoopVectorize/X86/svml-calls-finite.ll | 2 +- llvm/test/Transforms/LoopVectorize/X86/svml-calls.ll | 2 +- llvm/test/Transforms/LoopVectorize/X86/veclib-calls.ll | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/llvm/test/Transforms/LoopVectorize/PowerPC/massv-altivec.ll b/llvm/test/Transforms/LoopVectorize/PowerPC/massv-altivec.ll index c63db5b..df2aa99f 100644 --- a/llvm/test/Transforms/LoopVectorize/PowerPC/massv-altivec.ll +++ b/llvm/test/Transforms/LoopVectorize/PowerPC/massv-altivec.ll @@ -1,4 +1,4 @@ -; RUN: opt -vector-library=MASSV -loop-vectorize -force-vector-interleave=1 -mattr=-altivec -S < %s | FileCheck %s +; RUN: opt -vector-library=MASSV -inject-tli-mappings -loop-vectorize -force-vector-interleave=1 -mattr=-altivec -S < %s | FileCheck %s target datalayout = "e-m:e-i64:64-n32:64" target triple = "powerpc64le-unknown-linux-gnu" diff --git a/llvm/test/Transforms/LoopVectorize/PowerPC/massv-calls.ll b/llvm/test/Transforms/LoopVectorize/PowerPC/massv-calls.ll index a08c23b..eafca05 100644 --- a/llvm/test/Transforms/LoopVectorize/PowerPC/massv-calls.ll +++ b/llvm/test/Transforms/LoopVectorize/PowerPC/massv-calls.ll @@ -1,4 +1,4 @@ -; RUN: opt -vector-library=MASSV -loop-vectorize -force-vector-interleave=1 -S < %s | FileCheck %s +; RUN: opt -vector-library=MASSV -inject-tli-mappings -loop-vectorize -force-vector-interleave=1 -S < %s | FileCheck %s target datalayout = "e-m:e-i64:64-n32:64" target triple = "powerpc64le-unknown-linux-gnu" diff --git a/llvm/test/Transforms/LoopVectorize/PowerPC/massv-nobuiltin.ll b/llvm/test/Transforms/LoopVectorize/PowerPC/massv-nobuiltin.ll index e7503b6..8723269 100644 --- a/llvm/test/Transforms/LoopVectorize/PowerPC/massv-nobuiltin.ll +++ b/llvm/test/Transforms/LoopVectorize/PowerPC/massv-nobuiltin.ll @@ -1,4 +1,4 @@ -; RUN: opt -vector-library=MASSV -loop-vectorize -force-vector-interleave=1 -S < %s | FileCheck %s +; RUN: opt -vector-library=MASSV -inject-tli-mappings -loop-vectorize -force-vector-interleave=1 -S < %s | FileCheck %s target datalayout = "e-m:e-i64:64-n32:64" target triple = "powerpc64le-unknown-linux-gnu" diff --git a/llvm/test/Transforms/LoopVectorize/PowerPC/massv-unsupported.ll b/llvm/test/Transforms/LoopVectorize/PowerPC/massv-unsupported.ll index f9b4b72..575f9b2 100644 --- a/llvm/test/Transforms/LoopVectorize/PowerPC/massv-unsupported.ll +++ b/llvm/test/Transforms/LoopVectorize/PowerPC/massv-unsupported.ll @@ -1,4 +1,4 @@ -; RUN: opt -vector-library=MASSV -loop-vectorize -force-vector-interleave=1 -S < %s | FileCheck %s +; RUN: opt -vector-library=MASSV -inject-tli-mappings -loop-vectorize -force-vector-interleave=1 -S < %s | FileCheck %s target datalayout = "e-m:e-i64:64-n32:64" target triple = "powerpc64le-unknown-linux-gnu" diff --git a/llvm/test/Transforms/LoopVectorize/PowerPC/widened-massv-call.ll b/llvm/test/Transforms/LoopVectorize/PowerPC/widened-massv-call.ll index 1809852..f562659 100644 --- a/llvm/test/Transforms/LoopVectorize/PowerPC/widened-massv-call.ll +++ b/llvm/test/Transforms/LoopVectorize/PowerPC/widened-massv-call.ll @@ -1,6 +1,6 @@ ; NOTE: Assertions have been autogenerated by utils/update_test_checks.py ; RUN: opt < %s -vector-library=MASSV -force-vector-interleave=1 \ -; RUN: -vectorizer-maximize-bandwidth -O2 -loop-vectorize \ +; RUN: -vectorizer-maximize-bandwidth -O2 -inject-tli-mappings -loop-vectorize \ ; RUN: -mtriple=powerpc64le-unknown-linux -S -mcpu=pwr9 2>&1 | FileCheck %s define dso_local double @test(float* %Arr) { diff --git a/llvm/test/Transforms/LoopVectorize/X86/svml-calls-finite.ll b/llvm/test/Transforms/LoopVectorize/X86/svml-calls-finite.ll index 1e55e7d..d6e3469 100644 --- a/llvm/test/Transforms/LoopVectorize/X86/svml-calls-finite.ll +++ b/llvm/test/Transforms/LoopVectorize/X86/svml-calls-finite.ll @@ -1,4 +1,4 @@ -; RUN: opt -vector-library=SVML -loop-vectorize -S < %s | FileCheck %s +; RUN: opt -vector-library=SVML -inject-tli-mappings -loop-vectorize -S < %s | FileCheck %s ; Test to verify that when math headers are built with ; __FINITE_MATH_ONLY__ enabled, causing use of ___finite diff --git a/llvm/test/Transforms/LoopVectorize/X86/svml-calls.ll b/llvm/test/Transforms/LoopVectorize/X86/svml-calls.ll index 1f2b71f..aa8a25c 100644 --- a/llvm/test/Transforms/LoopVectorize/X86/svml-calls.ll +++ b/llvm/test/Transforms/LoopVectorize/X86/svml-calls.ll @@ -1,4 +1,4 @@ -; RUN: opt -vector-library=SVML -loop-vectorize -force-vector-width=4 -force-vector-interleave=1 -mattr=avx -S < %s | FileCheck %s +; RUN: opt -vector-library=SVML -inject-tli-mappings -loop-vectorize -force-vector-width=4 -force-vector-interleave=1 -mattr=avx -S < %s | FileCheck %s target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" diff --git a/llvm/test/Transforms/LoopVectorize/X86/veclib-calls.ll b/llvm/test/Transforms/LoopVectorize/X86/veclib-calls.ll index 6f8f522..8cbcf93 100644 --- a/llvm/test/Transforms/LoopVectorize/X86/veclib-calls.ll +++ b/llvm/test/Transforms/LoopVectorize/X86/veclib-calls.ll @@ -1,4 +1,4 @@ -; RUN: opt < %s -vector-library=Accelerate -loop-vectorize -S | FileCheck %s +; RUN: opt < %s -vector-library=Accelerate -inject-tli-mappings -loop-vectorize -S | FileCheck %s target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128" target triple = "x86_64-unknown-linux-gnu" -- 2.7.4