Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

core: introduce TypedAttributeConstraint #3318

Merged
merged 3 commits into from
Nov 22, 2024
Merged

core: introduce TypedAttributeConstraint #3318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a21644a
dialects: (builtin) make DenseIntOrFPElementsAttr a TypedAttribute
alexarice Nov 22, 2024
bc5ea1e
Remove unused import
alexarice Nov 22, 2024
846e360
core: introduce TypedAttributeConstraint
alexarice Oct 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions tests/filecheck/dialects/fsm/fsm_invalid.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,9 @@
"fsm.transition"() ({
"fsm.return"(%arg0) : (i1) -> ()
}, {

}) {nextState = @A} : () -> ()

}) {sym_name = "A"} : () -> ()
}) {function_type = (i1) -> (i1), initialState = "A", sym_name = "foo", res_names = ["names"],res_attrs = [{"name"="1","type"="2"}] } : () -> ()

Expand All @@ -160,7 +160,7 @@
"fsm.output"() : () -> ()
}, {
"fsm.transition"() ({
^bb1(%arg3: i1):
^bb1(%arg3: i1):
"fsm.update"(%arg1, %arg2) {variable = "v1" , value = "v2"}: (i16,i16) -> ()
"fsm.output"() : () -> ()
}, {
Expand All @@ -179,16 +179,16 @@

"fsm.state"() ({
"fsm.output"() : () -> ()

}, {
"fsm.transition"() ({

}, {
^bb1(%arg3: i1):
^bb1(%arg3: i1):
"fsm.update"(%arg1, %arg2) {variable = "v1" , value = "v2"}: (i16,i16) -> ()
"fsm.update"(%arg1, %arg2) {variable = "v1" , value = "v2"}: (i16,i16) -> ()
}) {nextState = @A} : () -> ()

}) {sym_name = "A"} : () -> ()
}) {function_type = () -> (), initialState = "A", sym_name = "foo", res_names = ["names"],res_attrs = [{"name"="1","type"="2"}] } : () -> ()

Expand All @@ -203,10 +203,10 @@

}, {
"fsm.transition"() ({

}, {
}) {nextState = @A} : () -> ()

}) {sym_name = "A"} : () -> ()

}) {function_type = (i16) -> (i16) , initialState = "A", sym_name = "foo"} : () -> ()
Expand Down Expand Up @@ -257,7 +257,7 @@
}, {
}) {nextState = @A} : () -> ()
}) {sym_name = "A"} : () -> ()

}) {function_type = (i16) -> (i1), initialState = "A", sym_name = "foo"} : () -> ()
%arg1 = "arith.constant"() {value = 0 : i16} : () -> i16
%arg2 = "arith.constant"() {value = 0 : i16} : () -> i16
Expand Down Expand Up @@ -328,12 +328,12 @@
}) {nextState = @C} : () -> ()
}) {sym_name = "C"} : () -> ()
}) {function_type = (i16) -> (i16), initialState = "A", sym_name = "foo"} : () -> ()

"func.func"() ({
%3 = "arith.constant"() {value = 16: i16} : () -> i16

%4 = "fsm.instance"() {machine = @foo, sym_name = "foo_inst"} : () -> !fsm.instancetype
%1 = "arith.constant"() {value = true} : () -> i16
%1 = "arith.constant"() {value = 0 : i16} : () -> i16
%2 = "fsm.trigger"(%1, %4) : (i16, !fsm.instancetype) -> i1
"func.return"() : () -> ()
}) {function_type = () -> (), sym_name = "qux"} : () -> ()
Expand Down Expand Up @@ -371,10 +371,10 @@
}) {nextState = @C} : () -> ()
}) {sym_name = "C"} : () -> ()
}) {function_type = (i16) -> (i16), initialState = "A", sym_name = "foo"} : () -> ()

"func.func"() ({
%3 = "arith.constant"() {value = 16: i16} : () -> i16

%4 = "fsm.instance"() {machine = @foo, sym_name = "foo_inst"} : () -> !fsm.instancetype
%1 = "arith.constant"() {value = true} : () -> i1
%2 = "fsm.trigger"(%1, %4) : (i1, !fsm.instancetype) -> i16
Expand All @@ -391,8 +391,8 @@
%0 = "fsm.variable"() {initValue = 0 : i16, name = "cnt"} : () -> i16
"fsm.machine"() ({
%4 = "test.op"() {machine = @foo, sym_name = "foo_inst"} : () -> !fsm.instancetype
%1 = "arith.constant"() {value = true} : () -> i16
%2 = "fsm.trigger"(%1, %4) : (i16, !fsm.instancetype) -> i1
%1 = "arith.constant"() {value = true} : () -> i1
%2 = "fsm.trigger"(%1, %4) : (i1, !fsm.instancetype) -> i1
"func.return"() : () -> ()
}) {function_type = () -> (), sym_name = "qux"} : () -> ()

Expand Down
2 changes: 1 addition & 1 deletion tests/filecheck/runner/factorial.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ builtin.module {
"func.return"(%ret) : (i64) -> ()
}
func.func @main() -> index {
%zero = "arith.constant"() {"value" = 0} : () -> index
%zero = "arith.constant"() {"value" = 0 : index} : () -> index
%i = "arith.constant"() {"value" = 12} : () -> i64
%fac = "func.call"(%i) {"callee" = @factorial} : (i64) -> i64
printf.print_format "factorial({})={}", %i : i64, %fac : i64
Expand Down
2 changes: 1 addition & 1 deletion tests/filecheck/runner/with-wgpu/global_id_inc.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ builtin.module attributes {gpu.container_module} {
%hmemref = "memref.alloc"() {"alignment" = 0 : i64, "operandSegmentSizes" = array<i32: 0, 0>} : () -> memref<4x4xindex>
"gpu.memcpy"(%hmemref, %memref) {"operandSegmentSizes" = array<i32: 0, 1, 1>} : (memref<4x4xindex>, memref<4x4xindex>) -> ()
printf.print_format "Result : {}", %hmemref : memref<4x4xindex>
%zero = "arith.constant"() {"value" = 0} : () -> (index)
%zero = "arith.constant"() {"value" = 0 : index} : () -> (index)
"func.return"(%zero) : (index) -> ()
}
}
Expand Down
24 changes: 12 additions & 12 deletions tests/filecheck/transforms/function-constant-pinning.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@


func.func @basic() -> i32 {
%v = "test.op"() {pin_to_constants = [0]} : () -> i32
%v = "test.op"() {pin_to_constants = [0 : i32]} : () -> i32
func.return %v : i32
}

Expand All @@ -11,7 +11,7 @@ func.func @basic() -> i32 {
// CHECK-NEXT: func.func @basic() -> i32 {
// CHECK-NEXT: %v = "test.op"() : () -> i32
// compare the value to the constant we want to specialize for
// CHECK-NEXT: %0 = arith.constant 0 : i64
// CHECK-NEXT: %0 = arith.constant 0 : i32
// CHECK-NEXT: %1 = arith.cmpi eq, %v, %0 : i32
// CHECK-NEXT: %2 = scf.if %1 -> (i32) {
// if they are equal, branch to specialized function
Expand All @@ -25,7 +25,7 @@ func.func @basic() -> i32 {
// specialized function here
// CHECK-NEXT: func.func @basic_pinned() -> i32 {
// original op is replaced by constant instantiation
// CHECK-NEXT: %v = arith.constant 0 : i64
// CHECK-NEXT: %v = arith.constant 0 : i32
// CHECK-NEXT: func.return %v : i32
// CHECK-NEXT: }

Expand Down Expand Up @@ -79,7 +79,7 @@ func.func @control_flow() {


func.func @function_args(%arg0: memref<100xf32>) -> i32 {
%v = "test.op"() {pin_to_constants = [0]} : () -> i32
%v = "test.op"() {pin_to_constants = [0 : i32]} : () -> i32

"test.op"(%v, %arg0) : (i32, memref<100xf32>) -> ()

Expand All @@ -89,7 +89,7 @@ func.func @function_args(%arg0: memref<100xf32>) -> i32 {

// CHECK-NEXT: func.func @function_args(%arg0 : memref<100xf32>) -> i32 {
// CHECK-NEXT: %v = "test.op"() : () -> i32
// CHECK-NEXT: %0 = arith.constant 0 : i64
// CHECK-NEXT: %0 = arith.constant 0 : i32
// CHECK-NEXT: %1 = arith.cmpi eq, %v, %0 : i32
// CHECK-NEXT: %2 = scf.if %1 -> (i32) {
// make sure that we forward function args to the specialized function
Expand All @@ -103,7 +103,7 @@ func.func @function_args(%arg0: memref<100xf32>) -> i32 {
// CHECK-NEXT: func.return %2 : i32
// CHECK-NEXT: }
// CHECK-NEXT: func.func @function_args_pinned(%arg0 : memref<100xf32>) -> i32 {
// CHECK-NEXT: %v = arith.constant 0 : i64
// CHECK-NEXT: %v = arith.constant 0 : i32
// here the function arg is used
// CHECK-NEXT: "test.op"(%v, %arg0) : (i32, memref<100xf32>) -> ()
// CHECK-NEXT: func.return %v : i32
Expand Down Expand Up @@ -155,7 +155,7 @@ func.func @control_flow_and_function_args(%arg: i32) -> i32 {


func.func @specialize_multi_case() -> i32 {
%v = "test.op"() {pin_to_constants = [0, 1]} : () -> i32
%v = "test.op"() {pin_to_constants = [0 : i32, 1 : i32]} : () -> i32
func.return %v : i32
}

Expand All @@ -164,13 +164,13 @@ func.func @specialize_multi_case() -> i32 {

// CHECK-NEXT: func.func @specialize_multi_case() -> i32 {
// CHECK-NEXT: %v = "test.op"() : () -> i32
// CHECK-NEXT: %0 = arith.constant 0 : i64
// CHECK-NEXT: %0 = arith.constant 0 : i32
// CHECK-NEXT: %1 = arith.cmpi eq, %v, %0 : i32
// CHECK-NEXT: %2 = scf.if %1 -> (i32) {
// CHECK-NEXT: %3 = func.call @specialize_multi_case_pinned_1() : () -> i32
// CHECK-NEXT: scf.yield %3 : i32
// CHECK-NEXT: } else {
// CHECK-NEXT: %4 = arith.constant 1 : i64
// CHECK-NEXT: %4 = arith.constant 1 : i32
// CHECK-NEXT: %5 = arith.cmpi eq, %v, %4 : i32
// CHECK-NEXT: %6 = scf.if %5 -> (i32) {
// CHECK-NEXT: %7 = func.call @specialize_multi_case_pinned() : () -> i32
Expand All @@ -185,8 +185,8 @@ func.func @specialize_multi_case() -> i32 {
// CHECK-NEXT: func.func @specialize_multi_case_pinned_1() -> i32 {
// this function still carries the old specialization check within it, but MLIR can see that
// the branch is never taken, so it's completely removed.
// CHECK-NEXT: %v = arith.constant 0 : i64
// CHECK-NEXT: %0 = arith.constant 1 : i64
// CHECK-NEXT: %v = arith.constant 0 : i32
// CHECK-NEXT: %0 = arith.constant 1 : i32
// CHECK-NEXT: %1 = arith.cmpi eq, %v, %0 : i32
// CHECK-NEXT: %2 = scf.if %1 -> (i32) {
// CHECK-NEXT: %3 = func.call @specialize_multi_case_pinned() : () -> i32
Expand All @@ -197,7 +197,7 @@ func.func @specialize_multi_case() -> i32 {
// CHECK-NEXT: func.return %2 : i32
// CHECK-NEXT: }
// CHECK-NEXT: func.func @specialize_multi_case_pinned() -> i32 {
// CHECK-NEXT: %v = arith.constant 1 : i64
// CHECK-NEXT: %v = arith.constant 1 : i32
// CHECK-NEXT: func.return %v : i32
// CHECK-NEXT: }

Expand Down
44 changes: 16 additions & 28 deletions xdsl/dialects/arith.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
AnyFloat,
AnyFloatConstr,
AnyIntegerAttr,
AnyIntegerAttrConstr,
ContainerOf,
DenseIntOrFPElementsAttr,
Float16Type,
Expand All @@ -25,8 +26,11 @@
from xdsl.dialects.utils import FastMathAttrBase, FastMathFlag
from xdsl.ir import Attribute, BitEnumAttribute, Dialect, Operation, SSAValue
from xdsl.irdl import (
AnyAttr,
AnyOf,
BaseAttr,
IRDLOperation,
TypedAttributeConstraint,
VarConstraint,
base,
irdl_attr_definition,
Expand All @@ -48,7 +52,6 @@
Pure,
)
from xdsl.utils.exceptions import VerifyException
from xdsl.utils.isattr import isattr
from xdsl.utils.str_enum import StrEnum

boolLike = ContainerOf(IntegerType(1))
Expand Down Expand Up @@ -124,11 +127,21 @@ def __init__(self, flags: None | Sequence[IntegerOverflowFlag] | Literal["none"]
@irdl_op_definition
class Constant(IRDLOperation):
name = "arith.constant"
result = result_def(Attribute)
value = prop_def(Attribute)
_T: ClassVar = VarConstraint("T", AnyAttr())
result = result_def(_T)
value = prop_def(
TypedAttributeConstraint(
AnyIntegerAttrConstr
| BaseAttr[FloatAttr[AnyFloat]](FloatAttr)
| BaseAttr(DenseIntOrFPElementsAttr),
_T,
)
)

traits = traits_def(ConstantLike(), Pure())

assembly_format = "attr-dict $value"

@overload
def __init__(
self,
Expand Down Expand Up @@ -162,31 +175,6 @@ def from_int_and_width(
properties={"value": IntegerAttr(value, value_type)},
)

def print(self, printer: Printer):
printer.print_op_attributes(self.attributes)

printer.print(" ")
printer.print_attribute(self.value)

@classmethod
def parse(cls: type[Constant], parser: Parser) -> Constant:
attrs = parser.parse_optional_attr_dict()

p0 = parser.pos
value = parser.parse_attribute()

if not isattr(
value,
base(AnyIntegerAttr)
| base(FloatAttr[AnyFloat])
| base(DenseIntOrFPElementsAttr),
):
parser.raise_error("Invalid constant value", p0, parser.pos)

c = Constant(value)
c.attributes.update(attrs)
return c


_T = TypeVar("_T", bound=Attribute)

Expand Down
63 changes: 60 additions & 3 deletions xdsl/dialects/builtin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
SymbolTable,
)
from xdsl.utils.exceptions import DiagnosticException, VerifyException
from xdsl.utils.hints import isa
from xdsl.utils.isattr import isattr

if TYPE_CHECKING:
Expand Down Expand Up @@ -512,6 +513,9 @@ def parse_with_type(
def print_without_type(self, printer: Printer):
return printer.print(self.value.data)

def get_type(self) -> Attribute:
return self.type

@staticmethod
def constr(
*,
Expand Down Expand Up @@ -1715,11 +1719,11 @@ def get_element_type(self) -> _UnrankedMemrefTypeElems:
VectorType[AttributeCovT] | TensorType[AttributeCovT] | MemRefType[AttributeCovT]
)

AnyDenseElement: TypeAlias = IntegerType | IndexType | AnyFloat


@irdl_attr_definition
class DenseIntOrFPElementsAttr(
ParametrizedAttribute, ContainerType[IntegerType | IndexType | AnyFloat]
):
class DenseIntOrFPElementsAttr(TypedAttribute, ContainerType[AnyDenseElement]):
name = "dense"
type: ParameterDef[
RankedStructure[IntegerType]
Expand Down Expand Up @@ -1871,6 +1875,59 @@ def tensor_from_list(
t = TensorType(data_type, shape)
return DenseIntOrFPElementsAttr.from_list(t, data)

@staticmethod
def parse_with_type(parser: AttrParser, type: Attribute) -> TypedAttribute:
assert isa(type, RankedStructure[AnyDenseElement])
return parser.parse_dense_int_or_fp_elements_attr(type)

@staticmethod
def _print_one_elem(val: Attribute, printer: Printer):
if isinstance(val, IntegerAttr):
printer.print_string(f"{val.value.data}")
elif isinstance(val, FloatAttr):
printer.print_float(cast(AnyFloatAttr, val))
else:
raise Exception(
"unexpected attribute type "
"in DenseIntOrFPElementsAttr: "
f"{type(val)}"
)

@staticmethod
def _print_dense_list(
array: Sequence[AnyIntegerAttr] | Sequence[AnyFloatAttr],
shape: Sequence[int],
printer: Printer,
):
printer.print_string("[")
if len(shape) > 1:
k = len(array) // shape[0]
printer.print_list(
(array[i : i + k] for i in range(0, len(array), k)),
lambda subarray: DenseIntOrFPElementsAttr._print_dense_list(
subarray, shape[1:], printer
),
)
else:
printer.print_list(
array,
lambda val: DenseIntOrFPElementsAttr._print_one_elem(val, printer),
)
printer.print_string("]")

def print_without_type(self, printer: Printer):
printer.print_string("dense<")
data = self.data.data
shape = self.get_shape() if self.shape_is_complete else (len(data),)
assert shape is not None, "If shape is complete, then it cannot be None"
if len(data) == 0:
pass
elif data.count(data[0]) == len(data):
DenseIntOrFPElementsAttr._print_one_elem(data[0], printer)
else:
DenseIntOrFPElementsAttr._print_dense_list(data, shape, printer)
printer.print_string(">")


Builtin = Dialect(
"builtin",
Expand Down
Loading
Loading