From 19f531d31ec8e21488b1852d9a99e0efef5f79f9 Mon Sep 17 00:00:00 2001 From: Sven van Haastregt Date: Wed, 7 Mar 2018 10:29:28 +0000 Subject: [PATCH] [LoadStoreVectorizer] Differentiate between <1 x T> and T The LoadStoreVectorizer thought that <1 x T> and T were the same types when merging stores, leading to a crash later. Patch by Erik Hogeman. Differential Revision: https://reviews.llvm.org/D44014 llvm-svn: 326884 --- llvm/lib/Transforms/Vectorize/LoadStoreVectorizer.cpp | 1 + .../Transforms/LoadStoreVectorizer/X86/vector-scalar.ll | 14 ++++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 llvm/test/Transforms/LoadStoreVectorizer/X86/vector-scalar.ll diff --git a/llvm/lib/Transforms/Vectorize/LoadStoreVectorizer.cpp b/llvm/lib/Transforms/Vectorize/LoadStoreVectorizer.cpp index 1b8a79a..f438aae 100644 --- a/llvm/lib/Transforms/Vectorize/LoadStoreVectorizer.cpp +++ b/llvm/lib/Transforms/Vectorize/LoadStoreVectorizer.cpp @@ -316,6 +316,7 @@ bool Vectorizer::isConsecutiveAccess(Value *A, Value *B) { Type *PtrATy = PtrA->getType()->getPointerElementType(); Type *PtrBTy = PtrB->getType()->getPointerElementType(); if (PtrA == PtrB || + PtrATy->isVectorTy() != PtrBTy->isVectorTy() || DL.getTypeStoreSize(PtrATy) != DL.getTypeStoreSize(PtrBTy) || DL.getTypeStoreSize(PtrATy->getScalarType()) != DL.getTypeStoreSize(PtrBTy->getScalarType())) diff --git a/llvm/test/Transforms/LoadStoreVectorizer/X86/vector-scalar.ll b/llvm/test/Transforms/LoadStoreVectorizer/X86/vector-scalar.ll new file mode 100644 index 0000000..379b235 --- /dev/null +++ b/llvm/test/Transforms/LoadStoreVectorizer/X86/vector-scalar.ll @@ -0,0 +1,14 @@ +; RUN: opt -mtriple=x86_64-unknown-linux-gnu -load-store-vectorizer -mcpu haswell -S -o - %s | FileCheck %s + +; Check that the LoadStoreVectorizer does not crash due to not differentiating <1 x T> and T. + +; CHECK-LABEL: @vector_scalar( +; CHECK: store double +; CHECK: store <1 x double> +define void @vector_scalar(double* %ptr, double %a, <1 x double> %b) { + %1 = bitcast double* %ptr to <1 x double>* + %2 = getelementptr <1 x double>, <1 x double>* %1, i32 1 + store double %a, double* %ptr, align 8 + store <1 x double> %b, <1 x double>* %2, align 8 + ret void +} -- 2.7.4