Move helpers

Author: MacDue

llvm/include/llvm/IR/StructWideningUtils.h

@@ -10,7 +10,6 @@
 #define LLVM_IR_VECTORUTILS_H
 
 #include "llvm/IR/DerivedTypes.h"
-#include "llvm/IR/StructWideningUtils.h"
 
 namespace llvm {
 
@@ -27,6 +26,18 @@ inline Type *ToVectorTy(Type *Scalar, unsigned VF) {
   return ToVectorTy(Scalar, ElementCount::getFixed(VF));
 }
 
+/// A helper for converting structs of scalar types to structs of vector types.
+/// Note: Only unpacked literal struct types are supported.
+Type *toVectorizedStructTy(StructType *StructTy, ElementCount EC);
+
+/// A helper for converting structs of vector types to structs of scalar types.
+/// Note: Only unpacked literal struct types are supported.
+Type *toScalarizedStructTy(StructType *StructTy);
+
+/// Returns true if `StructTy` is an unpacked literal struct where all elements
+/// are vectors of matching element count. This does not include empty structs.
+bool isVectorizedStructTy(StructType *StructTy);
+
 /// A helper for converting to vectorized types. For scalar types, this is
 /// equivalent to calling `ToVectorTy`. For struct types, this returns a new
 /// struct where each element type has been widened to a vector type. Note: Only
@@ -69,6 +80,10 @@ inline ElementCount getVectorizedTypeVF(Type *Ty) {
   return cast<VectorType>(getContainedTypes(Ty).front())->getElementCount();
 }
 
+inline bool isUnpackedStructLiteral(StructType *StructTy) {
+  return StructTy->isLiteral() && !StructTy->isPacked();
+}
+
 } // namespace llvm
 
 #endif

llvm/include/llvm/IR/VectorUtils.h

@@ -64,7 +64,6 @@ add_llvm_component_library(LLVMCore
   PseudoProbe.cpp
   ReplaceConstant.cpp
   Statepoint.cpp
-  StructWideningUtils.cpp
   StructuralHash.cpp
   Type.cpp
   TypedPointerType.cpp
@@ -74,6 +73,7 @@ add_llvm_component_library(LLVMCore
   Value.cpp
   ValueSymbolTable.cpp
   VectorBuilder.cpp
+  VectorUtils.cpp
   Verifier.cpp
   VFABIDemangler.cpp
   RuntimeLibcalls.cpp

llvm/lib/IR/CMakeLists.txt

@@ -1,14 +1,13 @@
-//===- StructWideningUtils.cpp - Utils for vectorizing struct types------- ===//
+//===- VectorUtils.cpp - Vector type utility functions --------------------===//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/IR/StructWideningUtils.h"
-#include "llvm/ADT/SmallVectorExtras.h"
 #include "llvm/IR/VectorUtils.h"
+#include "llvm/ADT/SmallVectorExtras.h"
 
 using namespace llvm;