[mlir][NFC] Renamed VectorOps to Vector

Summary: Renamed VectorOps to Vector to avoid the redundant Ops suffix.

Differential Revision: https://reviews.llvm.org/D76317
This commit is contained in:
Rob Suderman
2020-03-17 15:24:27 -07:00
committed by River Riddle
parent 363dd3f394
commit 4d60f47b08
36 changed files with 65 additions and 65 deletions

View File

@@ -91,7 +91,7 @@ captured by LLVM peephole optimizations of on different types that core MLIR
supports (e.g. Scalable Vectors) are welcome future extensions.
### Virtual Vector Ops
Some existing Standard and VectorOps Dialect on `n-D` `vector` types comprise:
Some existing Standard and Vector Dialect on `n-D` `vector` types comprise:
```
%2 = std.addf %0, %1 : vector<3x7x8xf32> // -> vector<3x7x8xf32>
%2 = std.mulf %0, %1 : vector<3x7x8xf32> // -> vector<3x7x8xf32>
@@ -112,9 +112,9 @@ vector.transfer_write %f1, %A[%i0, %i1, %i2, %i3]
vector<5x4x3xf32>, memref<?x?x?x?xf32>
```
The list of VectorOps is currently undergoing evolutions and is best kept
The list of Vector is currently undergoing evolutions and is best kept
track of by following the evolution of the
[VectorOps.td](https://github.com/llvm/llvm-project/blob/master/mlir/include/mlir/Dialect/VectorOps/VectorOps.td)
[VectorOps.td](https://github.com/llvm/llvm-project/blob/master/mlir/include/mlir/Dialect/Vector/VectorOps.td)
ODS file (markdown documentation is automatically generated locally when
building and populates the [Vector
doc](https://github.com/llvm/llvm-project/blob/master/mlir/docs/Dialects/Vector.md)). Recent

View File

@@ -9,4 +9,4 @@ add_subdirectory(Quant)
add_subdirectory(Shape)
add_subdirectory(SPIRV)
add_subdirectory(StandardOps)
add_subdirectory(VectorOps)
add_subdirectory(Vector)

View File

@@ -14,7 +14,7 @@
#define MLIR_DIALECT_VECTOR_EDSC_BUILDERS_H_
#include "mlir/Dialect/Utils/StructuredOpsUtils.h"
#include "mlir/Dialect/VectorOps/VectorOps.h"
#include "mlir/Dialect/Vector/VectorOps.h"
#include "mlir/EDSC/Builders.h"
#include "mlir/EDSC/Intrinsics.h"
#include "mlir/IR/AffineExpr.h"

View File

@@ -1,14 +1,14 @@
//===- Intrinsics.h - MLIR EDSC Intrinsics for VectorOps --------*- C++ -*-===//
//===- Intrinsics.h - MLIR EDSC Intrinsics for Vector -----------*- C++ -*-===//
//
// 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
//
//===----------------------------------------------------------------------===//
#ifndef MLIR_DIALECT_VECTOROPS_EDSC_INTRINSICS_H_
#define MLIR_DIALECT_VECTOROPS_EDSC_INTRINSICS_H_
#ifndef MLIR_DIALECT_VECTOR_EDSC_INTRINSICS_H_
#define MLIR_DIALECT_VECTOR_EDSC_INTRINSICS_H_
#include "mlir/Dialect/VectorOps/EDSC/Builders.h"
#include "mlir/Dialect/Vector/EDSC/Builders.h"
namespace mlir {
namespace edsc {
@@ -22,4 +22,4 @@ using vector_print = OperationBuilder<vector::PrintOp>;
} // namespace edsc
} // namespace mlir
#endif // MLIR_DIALECT_VECTOROPS_EDSC_INTRINSICS_H_
#endif // MLIR_DIALECT_VECTOR_EDSC_INTRINSICS_H_

View File

@@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//
#ifndef MLIR_DIALECT_VECTOROPS_VECTOROPS_H
#define MLIR_DIALECT_VECTOROPS_VECTOROPS_H
#ifndef MLIR_DIALECT_VECTOR_VECTOROPS_H
#define MLIR_DIALECT_VECTOR_VECTOROPS_H
#include "mlir/IR/Attributes.h"
#include "mlir/IR/Dialect.h"
@@ -61,11 +61,11 @@ IntegerType getVectorSubscriptType(Builder &builder);
ArrayAttr getVectorSubscriptAttr(Builder &b, ArrayRef<int64_t> values);
#define GET_OP_CLASSES
#include "mlir/Dialect/VectorOps/VectorOps.h.inc"
#include "mlir/Dialect/Vector/VectorOps.h.inc"
#include "mlir/Dialect/VectorOps/VectorOpsDialect.h.inc"
#include "mlir/Dialect/Vector/VectorOpsDialect.h.inc"
} // end namespace vector
} // end namespace mlir
#endif // MLIR_DIALECT_VECTOROPS_VECTOROPS_H
#endif // MLIR_DIALECT_VECTOR_VECTOROPS_H

View File

@@ -16,7 +16,7 @@
include "mlir/Dialect/AffineOps/AffineOpsBase.td"
include "mlir/Interfaces/SideEffects.td"
def VectorOps_Dialect : Dialect {
def Vector_Dialect : Dialect {
let name = "vector";
let cppNamespace = "vector";
let hasConstantMaterializer = 1;
@@ -24,7 +24,7 @@ def VectorOps_Dialect : Dialect {
// Base class for Vector dialect ops.
class Vector_Op<string mnemonic, list<OpTrait> traits = []> :
Op<VectorOps_Dialect, mnemonic, traits> {
Op<Vector_Dialect, mnemonic, traits> {
// For every vector op, there needs to be a:
// * void print(OpAsmPrinter &p, ${C++ class of Op} op)
// * LogicalResult verify(${C++ class of Op} op)
@@ -433,7 +433,7 @@ def Vector_ExtractSlicesOp :
}
def Vector_FMAOp :
Op<VectorOps_Dialect, "fma", [NoSideEffect,
Op<Vector_Dialect, "fma", [NoSideEffect,
AllTypesMatch<["lhs", "rhs", "acc", "result"]>]>,
Arguments<(ins AnyVector:$lhs, AnyVector:$rhs, AnyVector:$acc)>,
Results<(outs AnyVector:$result)> {

View File

@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
#ifndef DIALECT_VECTOROPS_VECTORTRANSFORMS_H_
#define DIALECT_VECTOROPS_VECTORTRANSFORMS_H_
#ifndef DIALECT_VECTOR_VECTORTRANSFORMS_H_
#define DIALECT_VECTOR_VECTORTRANSFORMS_H_
#include "mlir/IR/PatternMatch.h"
@@ -71,4 +71,4 @@ unrollSingleResultOpMatchingType(PatternRewriter &builder, Operation *op,
} // namespace vector
} // namespace mlir
#endif // DIALECT_VECTOROPS_VECTORTRANSFORMS_H_
#endif // DIALECT_VECTOR_VECTORTRANSFORMS_H_

View File

@@ -6,8 +6,8 @@
//
//===----------------------------------------------------------------------===//
#ifndef MLIR_DIALECT_VECTOROPS_VECTORUTILS_H_
#define MLIR_DIALECT_VECTOROPS_VECTORUTILS_H_
#ifndef MLIR_DIALECT_VECTOR_VECTORUTILS_H_
#define MLIR_DIALECT_VECTOR_VECTORUTILS_H_
#include "mlir/Support/LLVM.h"
@@ -155,4 +155,4 @@ bool operatesOnSuperVectorsOf(Operation &op, VectorType subVectorType);
} // end namespace matcher
} // end namespace mlir
#endif // MLIR_DIALECT_VECTOROPS_VECTORUTILS_H_
#endif // MLIR_DIALECT_VECTOR_VECTORUTILS_H_

View File

@@ -28,7 +28,7 @@
#include "mlir/Dialect/SPIRV/SPIRVDialect.h"
#include "mlir/Dialect/Shape/IR/Shape.h"
#include "mlir/Dialect/StandardOps/IR/Ops.h"
#include "mlir/Dialect/VectorOps/VectorOps.h"
#include "mlir/Dialect/Vector/VectorOps.h"
#include "mlir/IR/Dialect.h"
namespace mlir {
@@ -47,7 +47,7 @@ inline void registerAllDialects() {
registerDialect<quant::QuantizationDialect>();
registerDialect<spirv::SPIRVDialect>();
registerDialect<StandardOpsDialect>();
registerDialect<vector::VectorOpsDialect>();
registerDialect<vector::VectorDialect>();
registerDialect<NVVM::NVVMDialect>();
registerDialect<ROCDL::ROCDLDialect>();
registerDialect<SDBMDialect>();

View File

@@ -7,7 +7,7 @@ add_mlir_conversion_library(MLIRVectorToLLVM
set(LIBS
MLIRLLVMIR
MLIRStandardToLLVM
MLIRVectorOps
MLIRVector
MLIRTransforms
LLVMCore
LLVMSupport

View File

@@ -12,7 +12,7 @@
#include "mlir/Conversion/StandardToLLVM/ConvertStandardToLLVMPass.h"
#include "mlir/Dialect/LLVMIR/LLVMDialect.h"
#include "mlir/Dialect/StandardOps/IR/Ops.h"
#include "mlir/Dialect/VectorOps/VectorOps.h"
#include "mlir/Dialect/Vector/VectorOps.h"
#include "mlir/IR/Attributes.h"
#include "mlir/IR/Builders.h"
#include "mlir/IR/MLIRContext.h"

View File

@@ -16,7 +16,7 @@
#include "mlir/Dialect/AffineOps/EDSC/Intrinsics.h"
#include "mlir/Dialect/LoopOps/EDSC/Builders.h"
#include "mlir/Dialect/StandardOps/EDSC/Intrinsics.h"
#include "mlir/Dialect/VectorOps/VectorOps.h"
#include "mlir/Dialect/Vector/VectorOps.h"
#include "mlir/IR/AffineExpr.h"
#include "mlir/IR/AffineMap.h"
#include "mlir/IR/Attributes.h"

View File

@@ -10,7 +10,7 @@ add_subdirectory(SDBM)
add_subdirectory(Shape)
add_subdirectory(SPIRV)
add_subdirectory(StandardOps)
add_subdirectory(VectorOps)
add_subdirectory(Vector)
set(LLVM_OPTIONAL_SOURCES
Traits.cpp

View File

@@ -27,5 +27,5 @@ target_link_libraries(MLIRLinalgTransforms
MLIRStandardOps
MLIRStandardToLLVM
MLIRTransformUtils
MLIRVectorOps
MLIRVector
)

View File

@@ -16,7 +16,7 @@
#include "mlir/Dialect/Linalg/Utils/Utils.h"
#include "mlir/Dialect/StandardOps/EDSC/Intrinsics.h"
#include "mlir/Dialect/Utils/StructuredOpsUtils.h"
#include "mlir/Dialect/VectorOps/VectorOps.h"
#include "mlir/Dialect/Vector/VectorOps.h"
#include "mlir/IR/AffineExpr.h"
#include "mlir/IR/Matchers.h"
#include "mlir/IR/PatternMatch.h"

View File

@@ -1,17 +1,17 @@
add_mlir_dialect_library(MLIRVectorOps
add_mlir_dialect_library(MLIRVector
VectorOps.cpp
VectorTransforms.cpp
VectorUtils.cpp
EDSC/Builders.cpp
ADDITIONAL_HEADER_DIRS
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/VectorOps
${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/Vector
DEPENDS
MLIRVectorOpsIncGen
MLIRVectorTransformPatternsIncGen
)
target_link_libraries(MLIRVectorOps
target_link_libraries(MLIRVector
PUBLIC
MLIREDSC
MLIRIR

View File

@@ -6,9 +6,9 @@
//
//===----------------------------------------------------------------------===//
#include "mlir/Dialect/VectorOps/EDSC/Builders.h"
#include "mlir/Dialect/VectorOps/EDSC/Intrinsics.h"
#include "mlir/Dialect/VectorOps/VectorOps.h"
#include "mlir/Dialect/Vector/EDSC/Builders.h"
#include "mlir/Dialect/Vector/EDSC/Intrinsics.h"
#include "mlir/Dialect/Vector/VectorOps.h"
#include "mlir/EDSC/Builders.h"
#include "mlir/EDSC/Intrinsics.h"
#include "mlir/IR/AffineExpr.h"

View File

@@ -11,10 +11,10 @@
//
//===----------------------------------------------------------------------===//
#include "mlir/Dialect/VectorOps/VectorOps.h"
#include "mlir/Dialect/Vector/VectorOps.h"
#include "mlir/Dialect/StandardOps/IR/Ops.h"
#include "mlir/Dialect/Utils/StructuredOpsUtils.h"
#include "mlir/Dialect/VectorOps/VectorUtils.h"
#include "mlir/Dialect/Vector/VectorUtils.h"
#include "mlir/IR/AffineExpr.h"
#include "mlir/IR/AffineMap.h"
#include "mlir/IR/Builders.h"
@@ -32,20 +32,20 @@ using namespace mlir;
using namespace mlir::vector;
//===----------------------------------------------------------------------===//
// VectorOpsDialect
// VectorDialect
//===----------------------------------------------------------------------===//
VectorOpsDialect::VectorOpsDialect(MLIRContext *context)
VectorDialect::VectorDialect(MLIRContext *context)
: Dialect(getDialectNamespace(), context) {
addOperations<
#define GET_OP_LIST
#include "mlir/Dialect/VectorOps/VectorOps.cpp.inc"
#include "mlir/Dialect/Vector/VectorOps.cpp.inc"
>();
}
/// Materialize a single constant operation from a given attribute value with
/// the desired resultant type.
Operation *VectorOpsDialect::materializeConstant(OpBuilder &builder,
Operation *VectorDialect::materializeConstant(OpBuilder &builder,
Attribute value, Type type,
Location loc) {
return builder.create<ConstantOp>(loc, type, value);
@@ -1249,7 +1249,7 @@ static LogicalResult verifyTransferOp(Operation *op, MemRefType memrefType,
if (memrefVecEltRank > resultVecRank)
return op->emitOpError(
"requires memref vector element and vector result ranks to match.");
// TODO(b/146516564) Move this to isSuffix in VectorOps/Utils.h.
// TODO(b/146516564) Move this to isSuffix in Vector/Utils.h.
unsigned rankOffset = resultVecRank - memrefVecEltRank;
auto memrefVecEltShape = memrefVectorElementType.getShape();
auto resultVecShape = vectorType.getShape();
@@ -1657,7 +1657,7 @@ namespace mlir {
namespace vector {
#define GET_OP_CLASSES
#include "mlir/Dialect/VectorOps/VectorOps.cpp.inc"
#include "mlir/Dialect/Vector/VectorOps.cpp.inc"
} // namespace vector
} // namespace mlir

View File

@@ -15,9 +15,9 @@
#include "mlir/Dialect/AffineOps/AffineOps.h"
#include "mlir/Dialect/StandardOps/IR/Ops.h"
#include "mlir/Dialect/Utils/StructuredOpsUtils.h"
#include "mlir/Dialect/VectorOps/VectorOps.h"
#include "mlir/Dialect/VectorOps/VectorTransforms.h"
#include "mlir/Dialect/VectorOps/VectorUtils.h"
#include "mlir/Dialect/Vector/VectorOps.h"
#include "mlir/Dialect/Vector/VectorTransforms.h"
#include "mlir/Dialect/Vector/VectorUtils.h"
#include "mlir/IR/AffineExpr.h"
#include "mlir/IR/AffineMap.h"
#include "mlir/IR/Attributes.h"

View File

@@ -6,15 +6,15 @@
//
//===----------------------------------------------------------------------===//
//
// This file implements utility methods for working with the VectorOps dialect.
// This file implements utility methods for working with the Vector dialect.
//
//===----------------------------------------------------------------------===//
#include "mlir/Dialect/VectorOps/VectorUtils.h"
#include "mlir/Dialect/Vector/VectorUtils.h"
#include "mlir/Analysis/LoopAnalysis.h"
#include "mlir/Dialect/AffineOps/AffineOps.h"
#include "mlir/Dialect/StandardOps/IR/Ops.h"
#include "mlir/Dialect/VectorOps/VectorOps.h"
#include "mlir/Dialect/Vector/VectorOps.h"
#include "mlir/IR/Builders.h"
#include "mlir/IR/IntegerSet.h"
#include "mlir/IR/Operation.h"

View File

@@ -39,5 +39,5 @@ target_link_libraries(MLIRTransforms
MLIRLoopOps
MLIRPass
MLIRTransformUtils
MLIRVectorOps
MLIRVector
)

View File

@@ -17,8 +17,8 @@
#include "mlir/Analysis/Utils.h"
#include "mlir/Dialect/AffineOps/AffineOps.h"
#include "mlir/Dialect/StandardOps/IR/Ops.h"
#include "mlir/Dialect/VectorOps/VectorOps.h"
#include "mlir/Dialect/VectorOps/VectorUtils.h"
#include "mlir/Dialect/Vector/VectorOps.h"
#include "mlir/Dialect/Vector/VectorUtils.h"
#include "mlir/IR/AffineExpr.h"
#include "mlir/IR/Builders.h"
#include "mlir/IR/Location.h"

View File

@@ -14,7 +14,7 @@ target_link_libraries(mlir-edsc-builder-api-test
MLIRLoopOps
MLIRStandardOps
MLIRTransforms
MLIRVectorOps
MLIRVector
LLVMCore
LLVMSupport
)
@@ -26,6 +26,6 @@ whole_archive_link(mlir-edsc-builder-api-test
MLIRLinalgOps
MLIRLoopOps
MLIRStandardOps
MLIRVectorOps
MLIRVector
MLIRTransforms
)

View File

@@ -12,7 +12,7 @@
#include "mlir/Dialect/Linalg/EDSC/Intrinsics.h"
#include "mlir/Dialect/LoopOps/EDSC/Builders.h"
#include "mlir/Dialect/StandardOps/EDSC/Intrinsics.h"
#include "mlir/Dialect/VectorOps/EDSC/Intrinsics.h"
#include "mlir/Dialect/Vector/EDSC/Intrinsics.h"
#include "mlir/EDSC/Builders.h"
#include "mlir/EDSC/Intrinsics.h"
#include "mlir/IR/AffineExpr.h"
@@ -42,7 +42,7 @@ static MLIRContext &globalContext() {
registerDialect<linalg::LinalgDialect>();
registerDialect<loop::LoopOpsDialect>();
registerDialect<StandardOpsDialect>();
registerDialect<vector::VectorOpsDialect>();
registerDialect<vector::VectorDialect>();
return true;
}();
(void)init_once;

View File

@@ -15,8 +15,8 @@
#define TEST_VECTOR_TRANSFORMS_PATTERNS
include "mlir/Dialect/StandardOps/IR/Ops.td"
include "mlir/Dialect/VectorOps/VectorOps.td"
include "mlir/Dialect/VectorOps/VectorTransformPatterns.td"
include "mlir/Dialect/Vector/VectorOps.td"
include "mlir/Dialect/Vector/VectorTransformPatterns.td"
def : Pat<(AddFOp:$op_results $a, $b),
(UnrollVectorOp<[2, 2]> $op_results, $a, $b),

View File

@@ -48,5 +48,5 @@ target_link_libraries(MLIRTestTransforms
MLIRTestDialect
MLIRTransformUtils
MLIRVectorToLoops
MLIRVectorOps
MLIRVector
)

View File

@@ -9,8 +9,8 @@
#include <type_traits>
#include "mlir/Dialect/StandardOps/IR/Ops.h"
#include "mlir/Dialect/VectorOps/VectorOps.h"
#include "mlir/Dialect/VectorOps/VectorTransforms.h"
#include "mlir/Dialect/Vector/VectorOps.h"
#include "mlir/Dialect/Vector/VectorTransforms.h"
#include "mlir/IR/PatternMatch.h"
#include "mlir/Pass/Pass.h"

View File

@@ -14,7 +14,7 @@
#include "mlir/Analysis/NestedMatcher.h"
#include "mlir/Analysis/SliceAnalysis.h"
#include "mlir/Dialect/AffineOps/AffineOps.h"
#include "mlir/Dialect/VectorOps/VectorUtils.h"
#include "mlir/Dialect/Vector/VectorUtils.h"
#include "mlir/IR/Builders.h"
#include "mlir/IR/Diagnostics.h"
#include "mlir/IR/StandardTypes.h"