From 7c3ea2db37dce5e7b06dc9c8a3e0731d34b4e8bd Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Fri, 13 Jan 2023 16:36:25 -0800 Subject: [PATCH] [test] Deprecated llvm::TypeSize::getFixedSize => getFixedValue --- .../Target/DirectX/CBufferDataLayoutTests.cpp | 91 +++++++++++----------- 1 file changed, 46 insertions(+), 45 deletions(-) diff --git a/llvm/unittests/Target/DirectX/CBufferDataLayoutTests.cpp b/llvm/unittests/Target/DirectX/CBufferDataLayoutTests.cpp index c2cef65..3c00bc0 100644 --- a/llvm/unittests/Target/DirectX/CBufferDataLayoutTests.cpp +++ b/llvm/unittests/Target/DirectX/CBufferDataLayoutTests.cpp @@ -24,9 +24,9 @@ using namespace llvm::dxil; void checkLegacyLayout(CBufferDataLayout &CBDL, Type *T16, Type *T32, Type *T64) { // Basic types. - EXPECT_EQ(2ULL, CBDL.getTypeAllocSizeInBytes(T16).getFixedSize()); - EXPECT_EQ(4ULL, CBDL.getTypeAllocSizeInBytes(T32).getFixedSize()); - EXPECT_EQ(8ULL, CBDL.getTypeAllocSizeInBytes(T64).getFixedSize()); + EXPECT_EQ(2ULL, CBDL.getTypeAllocSizeInBytes(T16).getFixedValue()); + EXPECT_EQ(4ULL, CBDL.getTypeAllocSizeInBytes(T32).getFixedValue()); + EXPECT_EQ(8ULL, CBDL.getTypeAllocSizeInBytes(T64).getFixedValue()); // Vector types. Type *T16V2 = FixedVectorType::get(T16, 2); Type *T32V2 = FixedVectorType::get(T32, 2); @@ -37,15 +37,15 @@ void checkLegacyLayout(CBufferDataLayout &CBDL, Type *T16, Type *T32, Type *T16V4 = FixedVectorType::get(T16, 4); Type *T32V4 = FixedVectorType::get(T32, 4); Type *T64V4 = FixedVectorType::get(T64, 4); - EXPECT_EQ(4ULL, CBDL.getTypeAllocSizeInBytes(T16V2).getFixedSize()); - EXPECT_EQ(8ULL, CBDL.getTypeAllocSizeInBytes(T32V2).getFixedSize()); - EXPECT_EQ(16ULL, CBDL.getTypeAllocSizeInBytes(T64V2).getFixedSize()); - EXPECT_EQ(6ULL, CBDL.getTypeAllocSizeInBytes(T16V3).getFixedSize()); - EXPECT_EQ(12ULL, CBDL.getTypeAllocSizeInBytes(T32V3).getFixedSize()); - EXPECT_EQ(24ULL, CBDL.getTypeAllocSizeInBytes(T64V3).getFixedSize()); - EXPECT_EQ(8ULL, CBDL.getTypeAllocSizeInBytes(T16V4).getFixedSize()); - EXPECT_EQ(16ULL, CBDL.getTypeAllocSizeInBytes(T32V4).getFixedSize()); - EXPECT_EQ(32ULL, CBDL.getTypeAllocSizeInBytes(T64V4).getFixedSize()); + EXPECT_EQ(4ULL, CBDL.getTypeAllocSizeInBytes(T16V2).getFixedValue()); + EXPECT_EQ(8ULL, CBDL.getTypeAllocSizeInBytes(T32V2).getFixedValue()); + EXPECT_EQ(16ULL, CBDL.getTypeAllocSizeInBytes(T64V2).getFixedValue()); + EXPECT_EQ(6ULL, CBDL.getTypeAllocSizeInBytes(T16V3).getFixedValue()); + EXPECT_EQ(12ULL, CBDL.getTypeAllocSizeInBytes(T32V3).getFixedValue()); + EXPECT_EQ(24ULL, CBDL.getTypeAllocSizeInBytes(T64V3).getFixedValue()); + EXPECT_EQ(8ULL, CBDL.getTypeAllocSizeInBytes(T16V4).getFixedValue()); + EXPECT_EQ(16ULL, CBDL.getTypeAllocSizeInBytes(T32V4).getFixedValue()); + EXPECT_EQ(32ULL, CBDL.getTypeAllocSizeInBytes(T64V4).getFixedValue()); // Array types. @@ -53,28 +53,28 @@ void checkLegacyLayout(CBufferDataLayout &CBDL, Type *T16, Type *T32, ArrayType *T32A3 = ArrayType::get(T32, 3); ArrayType *T64A3 = ArrayType::get(T64, 3); - EXPECT_EQ(34ULL, CBDL.getTypeAllocSizeInBytes(T16A3).getFixedSize()); - EXPECT_EQ(36ULL, CBDL.getTypeAllocSizeInBytes(T32A3).getFixedSize()); - EXPECT_EQ(40ULL, CBDL.getTypeAllocSizeInBytes(T64A3).getFixedSize()); + EXPECT_EQ(34ULL, CBDL.getTypeAllocSizeInBytes(T16A3).getFixedValue()); + EXPECT_EQ(36ULL, CBDL.getTypeAllocSizeInBytes(T32A3).getFixedValue()); + EXPECT_EQ(40ULL, CBDL.getTypeAllocSizeInBytes(T64A3).getFixedValue()); ArrayType *T16V3A3 = ArrayType::get(T16V3, 3); ArrayType *T32V3A3 = ArrayType::get(T32V3, 3); ArrayType *T64V3A3 = ArrayType::get(T64V3, 3); - EXPECT_EQ(38ULL, CBDL.getTypeAllocSizeInBytes(T16V3A3).getFixedSize()); - EXPECT_EQ(44ULL, CBDL.getTypeAllocSizeInBytes(T32V3A3).getFixedSize()); - EXPECT_EQ(88ULL, CBDL.getTypeAllocSizeInBytes(T64V3A3).getFixedSize()); + EXPECT_EQ(38ULL, CBDL.getTypeAllocSizeInBytes(T16V3A3).getFixedValue()); + EXPECT_EQ(44ULL, CBDL.getTypeAllocSizeInBytes(T32V3A3).getFixedValue()); + EXPECT_EQ(88ULL, CBDL.getTypeAllocSizeInBytes(T64V3A3).getFixedValue()); ArrayType *T16V3A3A3 = ArrayType::get(T16V3A3, 3); ArrayType *T32V3A3A3 = ArrayType::get(T32V3A3, 3); ArrayType *T64V3A3A3 = ArrayType::get(T64V3A3, 3); EXPECT_EQ((48 * 2 + 38ULL), - CBDL.getTypeAllocSizeInBytes(T16V3A3A3).getFixedSize()); + CBDL.getTypeAllocSizeInBytes(T16V3A3A3).getFixedValue()); EXPECT_EQ((48 * 2 + 44ULL), - CBDL.getTypeAllocSizeInBytes(T32V3A3A3).getFixedSize()); + CBDL.getTypeAllocSizeInBytes(T32V3A3A3).getFixedValue()); EXPECT_EQ((96 * 2 + 88ULL), - CBDL.getTypeAllocSizeInBytes(T64V3A3A3).getFixedSize()); + CBDL.getTypeAllocSizeInBytes(T64V3A3A3).getFixedValue()); // Struct types. StructType *BasicMix0 = StructType::get(T16, T32, T64); @@ -84,12 +84,12 @@ void checkLegacyLayout(CBufferDataLayout &CBDL, Type *T16, Type *T32, StructType *BasicMix4 = StructType::get(T64, T16, T32); StructType *BasicMix5 = StructType::get(T64, T32, T16); - EXPECT_EQ(16ULL, CBDL.getTypeAllocSizeInBytes(BasicMix0).getFixedSize()); - EXPECT_EQ(20ULL, CBDL.getTypeAllocSizeInBytes(BasicMix1).getFixedSize()); - EXPECT_EQ(18ULL, CBDL.getTypeAllocSizeInBytes(BasicMix2).getFixedSize()); - EXPECT_EQ(16ULL, CBDL.getTypeAllocSizeInBytes(BasicMix3).getFixedSize()); - EXPECT_EQ(16ULL, CBDL.getTypeAllocSizeInBytes(BasicMix4).getFixedSize()); - EXPECT_EQ(14ULL, CBDL.getTypeAllocSizeInBytes(BasicMix5).getFixedSize()); + EXPECT_EQ(16ULL, CBDL.getTypeAllocSizeInBytes(BasicMix0).getFixedValue()); + EXPECT_EQ(20ULL, CBDL.getTypeAllocSizeInBytes(BasicMix1).getFixedValue()); + EXPECT_EQ(18ULL, CBDL.getTypeAllocSizeInBytes(BasicMix2).getFixedValue()); + EXPECT_EQ(16ULL, CBDL.getTypeAllocSizeInBytes(BasicMix3).getFixedValue()); + EXPECT_EQ(16ULL, CBDL.getTypeAllocSizeInBytes(BasicMix4).getFixedValue()); + EXPECT_EQ(14ULL, CBDL.getTypeAllocSizeInBytes(BasicMix5).getFixedValue()); StructType *VecMix0 = StructType::get(T16V3, T16, T32, T64V2); StructType *VecMix1 = StructType::get(T16V3, T32, T64V2, T16); @@ -98,12 +98,12 @@ void checkLegacyLayout(CBufferDataLayout &CBDL, Type *T16, Type *T32, StructType *VecMix4 = StructType::get(T32V3, T16, T16V2, T64); StructType *VecMix5 = StructType::get(T32V3, T64V3, T16V2, T64); - EXPECT_EQ(32ULL, CBDL.getTypeAllocSizeInBytes(VecMix0).getFixedSize()); - EXPECT_EQ(34ULL, CBDL.getTypeAllocSizeInBytes(VecMix1).getFixedSize()); - EXPECT_EQ(26ULL, CBDL.getTypeAllocSizeInBytes(VecMix2).getFixedSize()); - EXPECT_EQ(32ULL, CBDL.getTypeAllocSizeInBytes(VecMix3).getFixedSize()); - EXPECT_EQ(32ULL, CBDL.getTypeAllocSizeInBytes(VecMix4).getFixedSize()); - EXPECT_EQ(56ULL, CBDL.getTypeAllocSizeInBytes(VecMix5).getFixedSize()); + EXPECT_EQ(32ULL, CBDL.getTypeAllocSizeInBytes(VecMix0).getFixedValue()); + EXPECT_EQ(34ULL, CBDL.getTypeAllocSizeInBytes(VecMix1).getFixedValue()); + EXPECT_EQ(26ULL, CBDL.getTypeAllocSizeInBytes(VecMix2).getFixedValue()); + EXPECT_EQ(32ULL, CBDL.getTypeAllocSizeInBytes(VecMix3).getFixedValue()); + EXPECT_EQ(32ULL, CBDL.getTypeAllocSizeInBytes(VecMix4).getFixedValue()); + EXPECT_EQ(56ULL, CBDL.getTypeAllocSizeInBytes(VecMix5).getFixedValue()); StructType *ArrayMix0 = StructType::get(T16A3, T16, T32, T64A3); StructType *ArrayMix1 = StructType::get(T32A3, T16, T32, T16A3); @@ -112,12 +112,12 @@ void checkLegacyLayout(CBufferDataLayout &CBDL, Type *T16, Type *T32, StructType *ArrayMix4 = StructType::get(T16A3, T64, T16, T64A3); StructType *ArrayMix5 = StructType::get(T32A3, T64, T16, T32A3); - EXPECT_EQ(88ULL, CBDL.getTypeAllocSizeInBytes(ArrayMix0).getFixedSize()); - EXPECT_EQ(82ULL, CBDL.getTypeAllocSizeInBytes(ArrayMix1).getFixedSize()); - EXPECT_EQ(84ULL, CBDL.getTypeAllocSizeInBytes(ArrayMix2).getFixedSize()); - EXPECT_EQ(82ULL, CBDL.getTypeAllocSizeInBytes(ArrayMix3).getFixedSize()); - EXPECT_EQ(104ULL, CBDL.getTypeAllocSizeInBytes(ArrayMix4).getFixedSize()); - EXPECT_EQ(100ULL, CBDL.getTypeAllocSizeInBytes(ArrayMix5).getFixedSize()); + EXPECT_EQ(88ULL, CBDL.getTypeAllocSizeInBytes(ArrayMix0).getFixedValue()); + EXPECT_EQ(82ULL, CBDL.getTypeAllocSizeInBytes(ArrayMix1).getFixedValue()); + EXPECT_EQ(84ULL, CBDL.getTypeAllocSizeInBytes(ArrayMix2).getFixedValue()); + EXPECT_EQ(82ULL, CBDL.getTypeAllocSizeInBytes(ArrayMix3).getFixedValue()); + EXPECT_EQ(104ULL, CBDL.getTypeAllocSizeInBytes(ArrayMix4).getFixedValue()); + EXPECT_EQ(100ULL, CBDL.getTypeAllocSizeInBytes(ArrayMix5).getFixedValue()); StructType *StructMix0 = StructType::get(T16A3, T16, T32, ArrayMix0); StructType *StructMix1 = StructType::get(StructMix0, T16, T32, ArrayMix1); @@ -125,12 +125,13 @@ void checkLegacyLayout(CBufferDataLayout &CBDL, Type *T16, Type *T32, StructType *StructMix2 = StructType::get(StructArray0, T64); ArrayType *StructArray1 = ArrayType::get(StructMix2, 3); StructType *StructMix3 = StructType::get(StructArray1, T32); - EXPECT_EQ(136ULL, CBDL.getTypeAllocSizeInBytes(StructMix0).getFixedSize()); - EXPECT_EQ(226ULL, CBDL.getTypeAllocSizeInBytes(StructMix1).getFixedSize()); - EXPECT_EQ(706ULL, CBDL.getTypeAllocSizeInBytes(StructArray0).getFixedSize()); - EXPECT_EQ(720ULL, CBDL.getTypeAllocSizeInBytes(StructMix2).getFixedSize()); - EXPECT_EQ(2160ULL, CBDL.getTypeAllocSizeInBytes(StructArray1).getFixedSize()); - EXPECT_EQ(2164ULL, CBDL.getTypeAllocSizeInBytes(StructMix3).getFixedSize()); + EXPECT_EQ(136ULL, CBDL.getTypeAllocSizeInBytes(StructMix0).getFixedValue()); + EXPECT_EQ(226ULL, CBDL.getTypeAllocSizeInBytes(StructMix1).getFixedValue()); + EXPECT_EQ(706ULL, CBDL.getTypeAllocSizeInBytes(StructArray0).getFixedValue()); + EXPECT_EQ(720ULL, CBDL.getTypeAllocSizeInBytes(StructMix2).getFixedValue()); + EXPECT_EQ(2160ULL, + CBDL.getTypeAllocSizeInBytes(StructArray1).getFixedValue()); + EXPECT_EQ(2164ULL, CBDL.getTypeAllocSizeInBytes(StructMix3).getFixedValue()); } TEST(CBufferDataLayout, LegacyLayout) { -- 2.7.4