diff --git a/mlir/include/mlir/Dialect/SPIRV/TargetAndABI.h b/mlir/include/mlir/Dialect/SPIRV/SPIRVAttributes.h copy from mlir/include/mlir/Dialect/SPIRV/TargetAndABI.h copy to mlir/include/mlir/Dialect/SPIRV/SPIRVAttributes.h --- a/mlir/include/mlir/Dialect/SPIRV/TargetAndABI.h +++ b/mlir/include/mlir/Dialect/SPIRV/SPIRVAttributes.h @@ -1,4 +1,4 @@ -//===- TargetAndABI.h - SPIR-V target and ABI utilities --------*- C++ -*-===// +//===- SPIRVAttributes.h - SPIR-V attribute declarations -------*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -6,28 +6,23 @@ // //===----------------------------------------------------------------------===// // -// This file declares utilities for SPIR-V target and shader interface ABI. +// This file declares SPIR-V dialect specific attributes. // //===----------------------------------------------------------------------===// -#ifndef MLIR_DIALECT_SPIRV_TARGETANDABI_H -#define MLIR_DIALECT_SPIRV_TARGETANDABI_H +#ifndef MLIR_DIALECT_SPIRV_SPIRVATTRIBUTES_H +#define MLIR_DIALECT_SPIRV_SPIRVATTRIBUTES_H #include "mlir/IR/Attributes.h" #include "mlir/Support/LLVM.h" namespace mlir { -class OpBuilder; -class Operation; -class Value; - -// Pull in SPIR-V attribute definitions. +// Pull in SPIR-V attribute definitions for target and ABI. #include "mlir/Dialect/SPIRV/TargetAndABI.h.inc" namespace spirv { enum class Capability : uint32_t; enum class Extension; -enum class StorageClass : uint32_t; enum class Version : uint32_t; namespace detail { @@ -36,7 +31,6 @@ } // namespace detail /// SPIR-V dialect-specific attribute kinds. -// TODO(antiagainst): move to a more suitable place if we have more attributes. namespace AttrKind { enum Kind { TargetEnv = Attribute::FIRST_SPIRV_ATTR, /// Target environment @@ -137,53 +131,7 @@ VerCapExtAttr triple, DictionaryAttr limits); }; - -/// Returns the attribute name for specifying argument ABI information. -StringRef getInterfaceVarABIAttrName(); - -/// Gets the InterfaceVarABIAttr given its fields. -InterfaceVarABIAttr getInterfaceVarABIAttr(unsigned descriptorSet, - unsigned binding, - StorageClass storageClass, - MLIRContext *context); - -/// Returns the attribute name for specifying entry point information. -StringRef getEntryPointABIAttrName(); - -/// Gets the EntryPointABIAttr given its fields. -EntryPointABIAttr getEntryPointABIAttr(ArrayRef localSize, - MLIRContext *context); - -/// Queries the entry point ABI on the nearest function-like op containing the -/// given `op`. Returns null attribute if not found. -EntryPointABIAttr lookupEntryPointABI(Operation *op); - -/// Queries the local workgroup size from entry point ABI on the nearest -/// function-like op containing the given `op`. Returns null attribute if not -/// found. -DenseIntElementsAttr lookupLocalWorkGroupSize(Operation *op); - -/// Returns a default resource limits attribute that uses numbers from -/// "Table 46. Required Limits" of the Vulkan spec. -ResourceLimitsAttr getDefaultResourceLimits(MLIRContext *context); - -/// Returns the attribute name for specifying SPIR-V target environment. -StringRef getTargetEnvAttrName(); - -/// Returns the default target environment: SPIR-V 1.0 with Shader capability -/// and no extra extensions. -TargetEnvAttr getDefaultTargetEnv(MLIRContext *context); - -/// Queries the target environment recursively from enclosing symbol table ops -/// containing the given `op`. -TargetEnvAttr lookupTargetEnv(Operation *op); - -/// Queries the target environment recursively from enclosing symbol table ops -/// containing the given `op` or returns the default target environment as -/// returned by getDefaultTargetEnv() if not provided. -TargetEnvAttr lookupTargetEnvOrDefault(Operation *op); - } // namespace spirv } // namespace mlir -#endif // MLIR_DIALECT_SPIRV_TARGETANDABI_H +#endif // MLIR_DIALECT_SPIRV_SPIRVATTRIBUTES_H diff --git a/mlir/include/mlir/Dialect/SPIRV/TargetAndABI.h b/mlir/include/mlir/Dialect/SPIRV/TargetAndABI.h --- a/mlir/include/mlir/Dialect/SPIRV/TargetAndABI.h +++ b/mlir/include/mlir/Dialect/SPIRV/TargetAndABI.h @@ -13,130 +13,14 @@ #ifndef MLIR_DIALECT_SPIRV_TARGETANDABI_H #define MLIR_DIALECT_SPIRV_TARGETANDABI_H -#include "mlir/IR/Attributes.h" +#include "mlir/Dialect/SPIRV/SPIRVAttributes.h" #include "mlir/Support/LLVM.h" namespace mlir { -class OpBuilder; class Operation; -class Value; - -// Pull in SPIR-V attribute definitions. -#include "mlir/Dialect/SPIRV/TargetAndABI.h.inc" namespace spirv { -enum class Capability : uint32_t; -enum class Extension; enum class StorageClass : uint32_t; -enum class Version : uint32_t; - -namespace detail { -struct TargetEnvAttributeStorage; -struct VerCapExtAttributeStorage; -} // namespace detail - -/// SPIR-V dialect-specific attribute kinds. -// TODO(antiagainst): move to a more suitable place if we have more attributes. -namespace AttrKind { -enum Kind { - TargetEnv = Attribute::FIRST_SPIRV_ATTR, /// Target environment - VerCapExt, /// (version, extension, capability) triple -}; -} // namespace AttrKind - -/// An attribute that specifies the SPIR-V (version, capabilities, extensions) -/// triple. -class VerCapExtAttr - : public Attribute::AttrBase { -public: - using Base::Base; - - /// Gets a VerCapExtAttr instance. - static VerCapExtAttr get(Version version, ArrayRef capabilities, - ArrayRef extensions, - MLIRContext *context); - static VerCapExtAttr get(IntegerAttr version, ArrayAttr capabilities, - ArrayAttr extensions); - - /// Returns the attribute kind's name (without the 'spv.' prefix). - static StringRef getKindName(); - - /// Returns the version. - Version getVersion(); - - struct ext_iterator final - : public llvm::mapped_iterator { - explicit ext_iterator(ArrayAttr::iterator it); - }; - using ext_range = llvm::iterator_range; - - /// Returns the extensions. - ext_range getExtensions(); - /// Returns the extensions as a string array attribute. - ArrayAttr getExtensionsAttr(); - - struct cap_iterator final - : public llvm::mapped_iterator { - explicit cap_iterator(ArrayAttr::iterator it); - }; - using cap_range = llvm::iterator_range; - - /// Returns the capabilities. - cap_range getCapabilities(); - /// Returns the capabilities as an integer array attribute. - ArrayAttr getCapabilitiesAttr(); - - static bool kindof(unsigned kind) { return kind == AttrKind::VerCapExt; } - - static LogicalResult verifyConstructionInvariants(Location loc, - IntegerAttr version, - ArrayAttr capabilities, - ArrayAttr extensions); -}; - -/// An attribute that specifies the target version, allowed extensions and -/// capabilities, and resource limits. These information describles a SPIR-V -/// target environment. -class TargetEnvAttr - : public Attribute::AttrBase { -public: - using Base::Base; - - /// Gets a TargetEnvAttr instance. - static TargetEnvAttr get(VerCapExtAttr triple, DictionaryAttr limits); - - /// Returns the attribute kind's name (without the 'spv.' prefix). - static StringRef getKindName(); - - /// Returns the (version, capabilities, extensions) triple attribute. - VerCapExtAttr getTripleAttr(); - - /// Returns the target version. - Version getVersion(); - - /// Returns the target extensions. - VerCapExtAttr::ext_range getExtensions(); - /// Returns the target extensions as a string array attribute. - ArrayAttr getExtensionsAttr(); - - /// Returns the target capabilities. - VerCapExtAttr::cap_range getCapabilities(); - /// Returns the target capabilities as an integer array attribute. - ArrayAttr getCapabilitiesAttr(); - - /// Returns the target resource limits. - ResourceLimitsAttr getResourceLimits(); - - static bool kindof(unsigned kind) { return kind == AttrKind::TargetEnv; } - - static LogicalResult verifyConstructionInvariants(Location loc, - VerCapExtAttr triple, - DictionaryAttr limits); -}; /// Returns the attribute name for specifying argument ABI information. StringRef getInterfaceVarABIAttrName(); diff --git a/mlir/lib/Dialect/SPIRV/CMakeLists.txt b/mlir/lib/Dialect/SPIRV/CMakeLists.txt --- a/mlir/lib/Dialect/SPIRV/CMakeLists.txt +++ b/mlir/lib/Dialect/SPIRV/CMakeLists.txt @@ -4,6 +4,7 @@ add_mlir_dialect_library(MLIRSPIRV LayoutUtils.cpp + SPIRVAttributes.cpp SPIRVCanonicalization.cpp SPIRVDialect.cpp SPIRVOps.cpp diff --git a/mlir/lib/Dialect/SPIRV/TargetAndABI.cpp b/mlir/lib/Dialect/SPIRV/SPIRVAttributes.cpp copy from mlir/lib/Dialect/SPIRV/TargetAndABI.cpp copy to mlir/lib/Dialect/SPIRV/SPIRVAttributes.cpp --- a/mlir/lib/Dialect/SPIRV/TargetAndABI.cpp +++ b/mlir/lib/Dialect/SPIRV/SPIRVAttributes.cpp @@ -1,4 +1,4 @@ -//===- TargetAndABI.cpp - SPIR-V target and ABI utilities -----------------===// +//===- SPIRVAttributes.cpp - SPIR-V attribute definitions -----------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -6,12 +6,9 @@ // //===----------------------------------------------------------------------===// -#include "mlir/Dialect/SPIRV/TargetAndABI.h" +#include "mlir/Dialect/SPIRV/SPIRVAttributes.h" #include "mlir/Dialect/SPIRV/SPIRVTypes.h" #include "mlir/IR/Builders.h" -#include "mlir/IR/FunctionSupport.h" -#include "mlir/IR/Operation.h" -#include "mlir/IR/SymbolTable.h" using namespace mlir; @@ -221,98 +218,3 @@ return success(); } - -//===----------------------------------------------------------------------===// -// Utility functions -//===----------------------------------------------------------------------===// - -StringRef spirv::getInterfaceVarABIAttrName() { - return "spv.interface_var_abi"; -} - -spirv::InterfaceVarABIAttr -spirv::getInterfaceVarABIAttr(unsigned descriptorSet, unsigned binding, - spirv::StorageClass storageClass, - MLIRContext *context) { - Type i32Type = IntegerType::get(32, context); - return spirv::InterfaceVarABIAttr::get( - IntegerAttr::get(i32Type, descriptorSet), - IntegerAttr::get(i32Type, binding), - IntegerAttr::get(i32Type, static_cast(storageClass)), context); -} - -StringRef spirv::getEntryPointABIAttrName() { return "spv.entry_point_abi"; } - -spirv::EntryPointABIAttr -spirv::getEntryPointABIAttr(ArrayRef localSize, MLIRContext *context) { - assert(localSize.size() == 3); - return spirv::EntryPointABIAttr::get( - DenseElementsAttr::get( - VectorType::get(3, IntegerType::get(32, context)), localSize) - .cast(), - context); -} - -spirv::EntryPointABIAttr spirv::lookupEntryPointABI(Operation *op) { - while (op && !op->hasTrait()) - op = op->getParentOp(); - if (!op) - return {}; - - if (auto attr = op->getAttrOfType( - spirv::getEntryPointABIAttrName())) - return attr; - - return {}; -} - -DenseIntElementsAttr spirv::lookupLocalWorkGroupSize(Operation *op) { - if (auto entryPoint = spirv::lookupEntryPointABI(op)) - return entryPoint.local_size(); - - return {}; -} - -spirv::ResourceLimitsAttr -spirv::getDefaultResourceLimits(MLIRContext *context) { - auto i32Type = IntegerType::get(32, context); - auto v3i32Type = VectorType::get(3, i32Type); - - // These numbers are from "Table 46. Required Limits" of the Vulkan spec. - return spirv::ResourceLimitsAttr ::get( - IntegerAttr::get(i32Type, 128), - DenseIntElementsAttr::get(v3i32Type, {128, 128, 64}), context); -} - -StringRef spirv::getTargetEnvAttrName() { return "spv.target_env"; } - -spirv::TargetEnvAttr spirv::getDefaultTargetEnv(MLIRContext *context) { - auto triple = spirv::VerCapExtAttr::get(spirv::Version::V_1_0, - {spirv::Capability::Shader}, - ArrayRef(), context); - return spirv::TargetEnvAttr::get(triple, - spirv::getDefaultResourceLimits(context)); -} - -spirv::TargetEnvAttr spirv::lookupTargetEnv(Operation *op) { - while (op) { - op = SymbolTable::getNearestSymbolTable(op); - if (!op) - break; - - if (auto attr = op->getAttrOfType( - spirv::getTargetEnvAttrName())) - return attr; - - op = op->getParentOp(); - } - - return {}; -} - -spirv::TargetEnvAttr spirv::lookupTargetEnvOrDefault(Operation *op) { - if (spirv::TargetEnvAttr attr = spirv::lookupTargetEnv(op)) - return attr; - - return getDefaultTargetEnv(op->getContext()); -} diff --git a/mlir/lib/Dialect/SPIRV/TargetAndABI.cpp b/mlir/lib/Dialect/SPIRV/TargetAndABI.cpp --- a/mlir/lib/Dialect/SPIRV/TargetAndABI.cpp +++ b/mlir/lib/Dialect/SPIRV/TargetAndABI.cpp @@ -15,217 +15,6 @@ using namespace mlir; -//===----------------------------------------------------------------------===// -// DictionaryDict derived attributes -//===----------------------------------------------------------------------===// - -namespace mlir { -#include "mlir/Dialect/SPIRV/TargetAndABI.cpp.inc" - -//===----------------------------------------------------------------------===// -// Attribute storage classes -//===----------------------------------------------------------------------===// - -namespace spirv { -namespace detail { -struct VerCapExtAttributeStorage : public AttributeStorage { - using KeyTy = std::tuple; - - VerCapExtAttributeStorage(Attribute version, Attribute capabilities, - Attribute extensions) - : version(version), capabilities(capabilities), extensions(extensions) {} - - bool operator==(const KeyTy &key) const { - return std::get<0>(key) == version && std::get<1>(key) == capabilities && - std::get<2>(key) == extensions; - } - - static VerCapExtAttributeStorage * - construct(AttributeStorageAllocator &allocator, const KeyTy &key) { - return new (allocator.allocate()) - VerCapExtAttributeStorage(std::get<0>(key), std::get<1>(key), - std::get<2>(key)); - } - - Attribute version; - Attribute capabilities; - Attribute extensions; -}; - -struct TargetEnvAttributeStorage : public AttributeStorage { - using KeyTy = std::pair; - - TargetEnvAttributeStorage(Attribute triple, Attribute limits) - : triple(triple), limits(limits) {} - - bool operator==(const KeyTy &key) const { - return key.first == triple && key.second == limits; - } - - static TargetEnvAttributeStorage * - construct(AttributeStorageAllocator &allocator, const KeyTy &key) { - return new (allocator.allocate()) - TargetEnvAttributeStorage(key.first, key.second); - } - - Attribute triple; - Attribute limits; -}; -} // namespace detail -} // namespace spirv -} // namespace mlir - -//===----------------------------------------------------------------------===// -// VerCapExtAttr -//===----------------------------------------------------------------------===// - -spirv::VerCapExtAttr spirv::VerCapExtAttr::get( - spirv::Version version, ArrayRef capabilities, - ArrayRef extensions, MLIRContext *context) { - Builder b(context); - - auto versionAttr = b.getI32IntegerAttr(static_cast(version)); - - SmallVector capAttrs; - capAttrs.reserve(capabilities.size()); - for (spirv::Capability cap : capabilities) - capAttrs.push_back(b.getI32IntegerAttr(static_cast(cap))); - - SmallVector extAttrs; - extAttrs.reserve(extensions.size()); - for (spirv::Extension ext : extensions) - extAttrs.push_back(b.getStringAttr(spirv::stringifyExtension(ext))); - - return get(versionAttr, b.getArrayAttr(capAttrs), b.getArrayAttr(extAttrs)); -} - -spirv::VerCapExtAttr spirv::VerCapExtAttr::get(IntegerAttr version, - ArrayAttr capabilities, - ArrayAttr extensions) { - assert(version && capabilities && extensions); - MLIRContext *context = version.getContext(); - return Base::get(context, spirv::AttrKind::VerCapExt, version, capabilities, - extensions); -} - -StringRef spirv::VerCapExtAttr::getKindName() { return "vce"; } - -spirv::Version spirv::VerCapExtAttr::getVersion() { - return static_cast( - getImpl()->version.cast().getValue().getZExtValue()); -} - -spirv::VerCapExtAttr::ext_iterator::ext_iterator(ArrayAttr::iterator it) - : llvm::mapped_iterator( - it, [](Attribute attr) { - return *symbolizeExtension(attr.cast().getValue()); - }) {} - -spirv::VerCapExtAttr::ext_range spirv::VerCapExtAttr::getExtensions() { - auto range = getExtensionsAttr().getValue(); - return {ext_iterator(range.begin()), ext_iterator(range.end())}; -} - -ArrayAttr spirv::VerCapExtAttr::getExtensionsAttr() { - return getImpl()->extensions.cast(); -} - -spirv::VerCapExtAttr::cap_iterator::cap_iterator(ArrayAttr::iterator it) - : llvm::mapped_iterator( - it, [](Attribute attr) { - return *symbolizeCapability( - attr.cast().getValue().getZExtValue()); - }) {} - -spirv::VerCapExtAttr::cap_range spirv::VerCapExtAttr::getCapabilities() { - auto range = getCapabilitiesAttr().getValue(); - return {cap_iterator(range.begin()), cap_iterator(range.end())}; -} - -ArrayAttr spirv::VerCapExtAttr::getCapabilitiesAttr() { - return getImpl()->capabilities.cast(); -} - -LogicalResult spirv::VerCapExtAttr::verifyConstructionInvariants( - Location loc, IntegerAttr version, ArrayAttr capabilities, - ArrayAttr extensions) { - if (!version.getType().isSignlessInteger(32)) - return emitError(loc, "expected 32-bit integer for version"); - - if (!llvm::all_of(capabilities.getValue(), [](Attribute attr) { - if (auto intAttr = attr.dyn_cast()) - if (spirv::symbolizeCapability(intAttr.getValue().getZExtValue())) - return true; - return false; - })) - return emitError(loc, "unknown capability in capability list"); - - if (!llvm::all_of(extensions.getValue(), [](Attribute attr) { - if (auto strAttr = attr.dyn_cast()) - if (spirv::symbolizeExtension(strAttr.getValue())) - return true; - return false; - })) - return emitError(loc, "unknown extension in extension list"); - - return success(); -} - -//===----------------------------------------------------------------------===// -// TargetEnvAttr -//===----------------------------------------------------------------------===// - -spirv::TargetEnvAttr spirv::TargetEnvAttr::get(spirv::VerCapExtAttr triple, - DictionaryAttr limits) { - assert(triple && limits && "expected valid triple and limits"); - MLIRContext *context = triple.getContext(); - return Base::get(context, spirv::AttrKind::TargetEnv, triple, limits); -} - -StringRef spirv::TargetEnvAttr::getKindName() { return "target_env"; } - -spirv::VerCapExtAttr spirv::TargetEnvAttr::getTripleAttr() { - return getImpl()->triple.cast(); -} - -spirv::Version spirv::TargetEnvAttr::getVersion() { - return getTripleAttr().getVersion(); -} - -spirv::VerCapExtAttr::ext_range spirv::TargetEnvAttr::getExtensions() { - return getTripleAttr().getExtensions(); -} - -ArrayAttr spirv::TargetEnvAttr::getExtensionsAttr() { - return getTripleAttr().getExtensionsAttr(); -} - -spirv::VerCapExtAttr::cap_range spirv::TargetEnvAttr::getCapabilities() { - return getTripleAttr().getCapabilities(); -} - -ArrayAttr spirv::TargetEnvAttr::getCapabilitiesAttr() { - return getTripleAttr().getCapabilitiesAttr(); -} - -spirv::ResourceLimitsAttr spirv::TargetEnvAttr::getResourceLimits() { - return getImpl()->limits.cast(); -} - -LogicalResult spirv::TargetEnvAttr::verifyConstructionInvariants( - Location loc, spirv::VerCapExtAttr triple, DictionaryAttr limits) { - if (!limits.isa()) - return emitError(loc, "expected spirv::ResourceLimitsAttr for limits"); - - return success(); -} - -//===----------------------------------------------------------------------===// -// Utility functions -//===----------------------------------------------------------------------===// - StringRef spirv::getInterfaceVarABIAttrName() { return "spv.interface_var_abi"; }