From e634f482eaaf82a757b9442c34c034235d7eb161 Mon Sep 17 00:00:00 2001 From: Christopher Tetreault Date: Thu, 9 Apr 2020 13:01:05 -0700 Subject: [PATCH] Clean up usages of asserting vector getters in Type Summary: Remove usages of asserting vector getters in Type in preparation for the VectorType refactor. The existence of these functions complicates the refactor while adding little value. Reviewers: arsenm, efriedma, sdesmalen Reviewed By: arsenm Subscribers: wdng, arsenm, jvesely, nhaehnle, hiraditya, kerbowa, llvm-commits Tags: #llvm Differential Revision: https://reviews.llvm.org/D77268 --- llvm/lib/Target/AMDGPU/AMDGPUHSAMetadataStreamer.cpp | 8 ++++---- llvm/lib/Target/AMDGPU/AMDGPULowerKernelArguments.cpp | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/llvm/lib/Target/AMDGPU/AMDGPUHSAMetadataStreamer.cpp b/llvm/lib/Target/AMDGPU/AMDGPUHSAMetadataStreamer.cpp index 4a39d9e..46778cc 100644 --- a/llvm/lib/Target/AMDGPU/AMDGPUHSAMetadataStreamer.cpp +++ b/llvm/lib/Target/AMDGPU/AMDGPUHSAMetadataStreamer.cpp @@ -153,7 +153,7 @@ ValueType MetadataStreamerV2::getValueType(Type *Ty, StringRef TypeName) const { case Type::PointerTyID: return getValueType(Ty->getPointerElementType(), TypeName); case Type::VectorTyID: - return getValueType(Ty->getVectorElementType(), TypeName); + return getValueType(cast(Ty)->getElementType(), TypeName); default: return ValueType::Struct; } @@ -188,7 +188,7 @@ std::string MetadataStreamerV2::getTypeName(Type *Ty, bool Signed) const { case Type::VectorTyID: { auto VecTy = cast(Ty); auto ElTy = VecTy->getElementType(); - auto NumElements = VecTy->getVectorNumElements(); + auto NumElements = VecTy->getNumElements(); return (Twine(getTypeName(ElTy, Signed)) + Twine(NumElements)).str(); } default: @@ -600,7 +600,7 @@ StringRef MetadataStreamerV3::getValueType(Type *Ty, StringRef TypeName) const { case Type::PointerTyID: return getValueType(Ty->getPointerElementType(), TypeName); case Type::VectorTyID: - return getValueType(Ty->getVectorElementType(), TypeName); + return getValueType(cast(Ty)->getElementType(), TypeName); default: return "struct"; } @@ -635,7 +635,7 @@ std::string MetadataStreamerV3::getTypeName(Type *Ty, bool Signed) const { case Type::VectorTyID: { auto VecTy = cast(Ty); auto ElTy = VecTy->getElementType(); - auto NumElements = VecTy->getVectorNumElements(); + auto NumElements = VecTy->getNumElements(); return (Twine(getTypeName(ElTy, Signed)) + Twine(NumElements)).str(); } default: diff --git a/llvm/lib/Target/AMDGPU/AMDGPULowerKernelArguments.cpp b/llvm/lib/Target/AMDGPU/AMDGPULowerKernelArguments.cpp index b7baecd..df6ae4a 100644 --- a/llvm/lib/Target/AMDGPU/AMDGPULowerKernelArguments.cpp +++ b/llvm/lib/Target/AMDGPU/AMDGPULowerKernelArguments.cpp @@ -152,7 +152,7 @@ bool AMDGPULowerKernelArguments::runOnFunction(Function &F) { } if (IsV3 && Size >= 32) { - V4Ty = VectorType::get(VT->getVectorElementType(), 4); + V4Ty = VectorType::get(VT->getElementType(), 4); // Use the hack that clang uses to avoid SelectionDAG ruining v3 loads AdjustedArgTy = V4Ty; } -- 2.7.4