diff --git a/llvm/lib/Target/X86/X86TargetTransformInfo.cpp b/llvm/lib/Target/X86/X86TargetTransformInfo.cpp --- a/llvm/lib/Target/X86/X86TargetTransformInfo.cpp +++ b/llvm/lib/Target/X86/X86TargetTransformInfo.cpp @@ -5111,6 +5111,8 @@ {3, MVT::v8i32, 7}, // (load 24i32 and) deinterleave into 3 x 8i32 {3, MVT::v16i32, 14}, // (load 48i32 and) deinterleave into 3 x 16i32 + {3, MVT::v2i64, 1}, // (load 6i64 and) deinterleave into 3 x 2i64 + {4, MVT::v2i8, 4}, // (load 8i8 and) deinterleave into 4 x 2i8 {4, MVT::v4i8, 4}, // (load 16i8 and) deinterleave into 4 x 4i8 {4, MVT::v8i8, 12}, // (load 32i8 and) deinterleave into 4 x 8i8 @@ -5178,6 +5180,8 @@ {3, MVT::v8i32, 11}, // interleave 3 x 8i32 into 24i32 (and store) {3, MVT::v16i32, 22}, // interleave 3 x 16i32 into 48i32 (and store) + {3, MVT::v2i64, 4}, // interleave 3 x 2i64 into 6i64 (and store) + {4, MVT::v2i8, 4}, // interleave 4 x 2i8 into 8i8 (and store) {4, MVT::v4i8, 4}, // interleave 4 x 4i8 into 16i8 (and store) {4, MVT::v8i8, 4}, // interleave 4 x 8i8 into 32i8 (and store) diff --git a/llvm/test/Analysis/CostModel/X86/interleaved-load-f64-stride-3.ll b/llvm/test/Analysis/CostModel/X86/interleaved-load-f64-stride-3.ll --- a/llvm/test/Analysis/CostModel/X86/interleaved-load-f64-stride-3.ll +++ b/llvm/test/Analysis/CostModel/X86/interleaved-load-f64-stride-3.ll @@ -24,7 +24,7 @@ ; AVX1: LV: Found an estimated cost of 96 for VF 16 For instruction: %v0 = load double, double* %in0, align 8 ; ; AVX2: LV: Found an estimated cost of 1 for VF 1 For instruction: %v0 = load double, double* %in0, align 8 -; AVX2: LV: Found an estimated cost of 10 for VF 2 For instruction: %v0 = load double, double* %in0, align 8 +; AVX2: LV: Found an estimated cost of 3 for VF 2 For instruction: %v0 = load double, double* %in0, align 8 ; AVX2: LV: Found an estimated cost of 24 for VF 4 For instruction: %v0 = load double, double* %in0, align 8 ; AVX2: LV: Found an estimated cost of 48 for VF 8 For instruction: %v0 = load double, double* %in0, align 8 ; AVX2: LV: Found an estimated cost of 96 for VF 16 For instruction: %v0 = load double, double* %in0, align 8 diff --git a/llvm/test/Analysis/CostModel/X86/interleaved-load-i64-stride-3.ll b/llvm/test/Analysis/CostModel/X86/interleaved-load-i64-stride-3.ll --- a/llvm/test/Analysis/CostModel/X86/interleaved-load-i64-stride-3.ll +++ b/llvm/test/Analysis/CostModel/X86/interleaved-load-i64-stride-3.ll @@ -24,7 +24,7 @@ ; AVX1: LV: Found an estimated cost of 156 for VF 16 For instruction: %v0 = load i64, i64* %in0, align 8 ; ; AVX2: LV: Found an estimated cost of 1 for VF 1 For instruction: %v0 = load i64, i64* %in0, align 8 -; AVX2: LV: Found an estimated cost of 16 for VF 2 For instruction: %v0 = load i64, i64* %in0, align 8 +; AVX2: LV: Found an estimated cost of 3 for VF 2 For instruction: %v0 = load i64, i64* %in0, align 8 ; AVX2: LV: Found an estimated cost of 39 for VF 4 For instruction: %v0 = load i64, i64* %in0, align 8 ; AVX2: LV: Found an estimated cost of 78 for VF 8 For instruction: %v0 = load i64, i64* %in0, align 8 ; AVX2: LV: Found an estimated cost of 156 for VF 16 For instruction: %v0 = load i64, i64* %in0, align 8 diff --git a/llvm/test/Analysis/CostModel/X86/interleaved-store-f64-stride-3.ll b/llvm/test/Analysis/CostModel/X86/interleaved-store-f64-stride-3.ll --- a/llvm/test/Analysis/CostModel/X86/interleaved-store-f64-stride-3.ll +++ b/llvm/test/Analysis/CostModel/X86/interleaved-store-f64-stride-3.ll @@ -24,7 +24,7 @@ ; AVX1: LV: Found an estimated cost of 108 for VF 16 For instruction: store double %v2, double* %out2, align 8 ; ; AVX2: LV: Found an estimated cost of 1 for VF 1 For instruction: store double %v2, double* %out2, align 8 -; AVX2: LV: Found an estimated cost of 11 for VF 2 For instruction: store double %v2, double* %out2, align 8 +; AVX2: LV: Found an estimated cost of 6 for VF 2 For instruction: store double %v2, double* %out2, align 8 ; AVX2: LV: Found an estimated cost of 27 for VF 4 For instruction: store double %v2, double* %out2, align 8 ; AVX2: LV: Found an estimated cost of 54 for VF 8 For instruction: store double %v2, double* %out2, align 8 ; AVX2: LV: Found an estimated cost of 108 for VF 16 For instruction: store double %v2, double* %out2, align 8 diff --git a/llvm/test/Analysis/CostModel/X86/interleaved-store-i64-stride-3.ll b/llvm/test/Analysis/CostModel/X86/interleaved-store-i64-stride-3.ll --- a/llvm/test/Analysis/CostModel/X86/interleaved-store-i64-stride-3.ll +++ b/llvm/test/Analysis/CostModel/X86/interleaved-store-i64-stride-3.ll @@ -24,7 +24,7 @@ ; AVX1: LV: Found an estimated cost of 156 for VF 16 For instruction: store i64 %v2, i64* %out2, align 8 ; ; AVX2: LV: Found an estimated cost of 1 for VF 1 For instruction: store i64 %v2, i64* %out2, align 8 -; AVX2: LV: Found an estimated cost of 17 for VF 2 For instruction: store i64 %v2, i64* %out2, align 8 +; AVX2: LV: Found an estimated cost of 6 for VF 2 For instruction: store i64 %v2, i64* %out2, align 8 ; AVX2: LV: Found an estimated cost of 39 for VF 4 For instruction: store i64 %v2, i64* %out2, align 8 ; AVX2: LV: Found an estimated cost of 78 for VF 8 For instruction: store i64 %v2, i64* %out2, align 8 ; AVX2: LV: Found an estimated cost of 156 for VF 16 For instruction: store i64 %v2, i64* %out2, align 8