Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
207 changes: 207 additions & 0 deletions mlir/include/mlir/Dialect/DXSA/IR/DXSAMoveOps.td
Original file line number Diff line number Diff line change
@@ -0,0 +1,207 @@
//===- DXSAMoveOps.td - DXSA move ops --------------------*- tablegen -*-===//
//
// 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
//
//===----------------------------------------------------------------------===//
//
// Move instructions of the DXSA dialect.
//
//===----------------------------------------------------------------------===//

#ifndef MLIR_DIALECT_DXSA_IR_DXSAMOVEOPS
#define MLIR_DIALECT_DXSA_IR_DXSAMOVEOPS

include "mlir/Dialect/DXSA/IR/DXSAOpBase.td"

//===----------------------------------------------------------------------===//
// dxsa.mov
//===----------------------------------------------------------------------===//

def DXSA_Mov : DXSA_UnaryOp<"mov"> {
let summary = "component-wise move";
let description = [{
The `dxsa.mov` operation copies each component of `$src` to `$dst`.
Source modifiers other than swizzle assume floating-point data; without
modifiers the bits are copied unaltered.

Example:

```mlir
dxsa.mov r<0>, r<1>
dxsa.mov r<0>, -|r<1>|
dxsa.mov r<0, <x, y>>, r<1, <y, z, x, w>>
```
}];
}

//===----------------------------------------------------------------------===//
// dxsa.mov_sat
//===----------------------------------------------------------------------===//

def DXSA_MovSat : DXSA_UnaryOp<"mov_sat"> {
let summary = "component-wise move, saturated to [0, 1]";
let description = [{
The `dxsa.mov_sat` operation copies each component of `$src`, clamps the
result to `[0.0, 1.0]`, and writes it to `$dst`.

Example:

```mlir
dxsa.mov_sat r<0>, r<1>
dxsa.mov_sat r<0>, -|r<1>|
```
}];
}

//===----------------------------------------------------------------------===//
// dxsa.dmov
//===----------------------------------------------------------------------===//

def DXSA_DMov : DXSA_UnaryOp<"dmov"> {
let summary = "component-wise double-precision move";
let description = [{
The `dxsa.dmov` operation copies each double-precision component of
`$src` to `$dst`. Source modifiers other than swizzle assume
floating-point data; without modifiers the bits are copied unaltered.

The source encodes double values as component pairs: (x,y) holds the
first double (x = low 32 bits, y = high 32 bits) and (z,w) holds the
second. Valid source swizzles are .xyzw, .xyxy, .zwxy, and .zwzw.
Valid destination write masks are .xy, .zw, and .xyzw.

Example:

```mlir
dxsa.dmov r<0>, r<1>
dxsa.dmov r<0, <x, y>>, r<1, <z, w, x, y>>
```
}];
}

//===----------------------------------------------------------------------===//
// dxsa.dmov_sat
//===----------------------------------------------------------------------===//

def DXSA_DMovSat : DXSA_UnaryOp<"dmov_sat"> {
let summary = "component-wise double-precision move, saturated to [0, 1]";
let description = [{
The `dxsa.dmov_sat` operation copies each double-precision component of
`$src`, clamps the result to `[0.0, 1.0]`, and writes it to `$dst`.

Example:

```mlir
dxsa.dmov_sat r<0>, r<1>
```
}];
}

//===----------------------------------------------------------------------===//
// dxsa.dmovc
//===----------------------------------------------------------------------===//

class DXSA_DMovConditionalOp<string mnemonic> : DXSA_Op<mnemonic> {
let arguments = (ins
DXSA_DstOperandAttr:$dst,
DXSA_SrcOperandAttr:$condition,
DXSA_SrcOperandAttr:$src1,
DXSA_SrcOperandAttr:$src2,
OptionalAttr<DXSA_ComponentMaskAttr>:$precise);
let results = (outs);
let assemblyFormat =
"(`precise` $precise^)? $dst `,` $condition `,` $src1 `,` $src2 attr-dict";
}

def DXSA_DMovC : DXSA_DMovConditionalOp<"dmovc"> {
let summary = "component-wise double-precision conditional move";
let description = [{
The `dxsa.dmovc` operation performs a component-wise double-precision
conditional move:

```
$dst = ($condition != 0) ? $src1 : $src2
```

The first two post-swizzle components of `$condition` are treated as two
independent 32-bit boolean values, one per output double. Doubles are
encoded as component pairs (x = low 32 bits, y = high 32 bits) and
(z = low 32 bits, w = high 32 bits). Valid `$dst` write masks are
`.xy`, `.zw`, and `.xyzw`; valid `$src1`/`$src2` swizzles are `.xyzw`,
`.xyxy`, `.zwxy`, and `.zwzw`.

Example:

```mlir
dxsa.dmovc r<0>, r<1>, r<2>, r<3>
dxsa.dmovc r<0, <x, y>>, r<1>, r<2, <z, w, x, y>>, r<3>
```
}];
}

//===----------------------------------------------------------------------===//
// dxsa.dmovc_sat
//===----------------------------------------------------------------------===//

def DXSA_DMovCSat : DXSA_DMovConditionalOp<"dmovc_sat"> {
let summary =
"component-wise double-precision conditional move, saturated to [0, 1]";
let description = [{
The `dxsa.dmovc_sat` operation performs a component-wise double-precision
conditional move, clamps the result to `[0.0, 1.0]`, and writes it to
`$dst`:

```
$dst = clamp(($condition != 0) ? $src1 : $src2, 0.0, 1.0)
```

Example:

```mlir
dxsa.dmovc_sat r<0>, r<1>, r<2>, r<3>
```
}];
}

//===----------------------------------------------------------------------===//
// dxsa.swapc
//===----------------------------------------------------------------------===//

def DXSA_SwapC : DXSA_Op<"swapc"> {
let summary = "component-wise conditional swap of two values";
let description = [{
The `dxsa.swapc` operation performs a component-wise conditional swap of
the values in `$src1` and `$src2`:

```
$dst0 = ($condition != 0) ? $src2 : $src1
$dst1 = ($condition != 0) ? $src1 : $src2
```

Both destinations are updated atomically with respect to the source
values, so reading and writing the same register is well-defined.

Example:

```mlir
dxsa.swapc r<0>, r<1>, r<2>, r<3>, r<4>
dxsa.swapc r<0, <x, y>>, r<1, <z, w>>, r<2>, r<3>, r<4>
```
}];

let arguments = (ins
DXSA_DstOperandAttr:$dst0,
DXSA_DstOperandAttr:$dst1,
DXSA_SrcOperandAttr:$condition,
DXSA_SrcOperandAttr:$src1,
DXSA_SrcOperandAttr:$src2,
OptionalAttr<DXSA_ComponentMaskAttr>:$precise);
let results = (outs);
let assemblyFormat = [{
(`precise` $precise^)? $dst0 `,` $dst1 `,` $condition `,` $src1 `,` $src2
attr-dict
}];
}

#endif // MLIR_DIALECT_DXSA_IR_DXSAMOVEOPS
1 change: 1 addition & 0 deletions mlir/include/mlir/Dialect/DXSA/IR/DXSAOps.td
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ include "mlir/Dialect/DXSA/IR/DXSAOpBase.td"
include "mlir/Dialect/DXSA/IR/DXSATypes.td"
include "mlir/Dialect/DXSA/IR/DXSAFPArithOps.td"
include "mlir/Dialect/DXSA/IR/DXSAIntArithOps.td"
include "mlir/Dialect/DXSA/IR/DXSAMoveOps.td"
include "mlir/Dialect/DXSA/IR/DXSAConditionOps.td"
include "mlir/Dialect/DXSA/IR/DXSABitwiseOps.td"
include "mlir/Dialect/DXSA/IR/DXSATypeConversionOps.td"
Expand Down
9 changes: 9 additions & 0 deletions mlir/lib/Target/DXSA/BinaryParser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2346,6 +2346,15 @@ class Parser {
return SATURABLE_OP(Sincos, 2, 1, HasPreciseAttr::Yes);
case D3D10_SB_OPCODE_SQRT:
return SATURABLE_OP(Sqrt, 1, 1, HasPreciseAttr::Yes);
// Move instructions
case D3D10_SB_OPCODE_MOV:
return SATURABLE_OP(Mov, 1, 1, HasPreciseAttr::Yes);
case D3D11_SB_OPCODE_DMOV:
return SATURABLE_OP(DMov, 1, 1, HasPreciseAttr::Yes);
case D3D11_SB_OPCODE_DMOVC:
return SATURABLE_OP(DMovC, 1, 3, HasPreciseAttr::Yes);
case D3D11_SB_OPCODE_SWAPC:
return PLAIN_OP(SwapC, 2, 3, HasPreciseAttr::Yes);
// Type conversion instructions
case D3D11_SB_OPCODE_DTOF:
return PLAIN_OP(DToF, 1, 1, HasPreciseAttr::Yes);
Expand Down
Binary file removed mlir/test/Target/DXSA/inputs/mov-index.bin
Binary file not shown.
Binary file removed mlir/test/Target/DXSA/inputs/mov.bin
Binary file not shown.
Binary file removed mlir/test/Target/DXSA/inputs/mov_index_rel_imm.bin
Binary file not shown.
14 changes: 0 additions & 14 deletions mlir/test/Target/DXSA/mov-index.mlir

This file was deleted.

17 changes: 0 additions & 17 deletions mlir/test/Target/DXSA/mov.mlir

This file was deleted.

13 changes: 0 additions & 13 deletions mlir/test/Target/DXSA/mov_index_rel_imm.mlir

This file was deleted.

105 changes: 105 additions & 0 deletions mlir/test/Target/DXSA/mov_ops.test
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
// RUN: mlir-translate --split-input-file --import-dxsa-hex %s | FileCheck %s
// RUN: mlir-translate --split-input-file --import-dxsa-hex %s | mlir-opt --split-input-file --verify-roundtrip

// CHECK-LABEL: dxsa.module {
// CHECK-NEXT: dxsa.mov r<0, <x>>, -|r<1, <y, z, w, y>>|
// CHECK-NEXT: }
0x06000036, 0x00100012, 0x00000000, 0x80100796, 0x000000c1, 0x00000001

// -----

// CHECK-LABEL: dxsa.module {
// CHECK-NEXT: dxsa.mov precise <x, y> r<0>, r<1>
// CHECK-NEXT: }
0x05180036, 0x001000f2, 0x00000000, 0x00100e46, 0x00000001

// -----

// CHECK-LABEL: dxsa.module {
// CHECK-NEXT: dxsa.mov_sat r<0, <x>>, -|r<1, <y, z, w, y>>|
// CHECK-NEXT: }
0x06002036, 0x00100012, 0x00000000, 0x80100796, 0x000000c1, 0x00000001

// -----

// CHECK-LABEL: dxsa.module {
// CHECK-NEXT: dxsa.mov_sat precise <x, y> r<0>, r<1>
// CHECK-NEXT: }
0x05182036, 0x001000f2, 0x00000000, 0x00100e46, 0x00000001

// -----

// CHECK-LABEL: dxsa.module {
// CHECK-NEXT: dxsa.dmov r<0, <x, y>>, -|r<1, <z, w, x, y>>|
// CHECK-NEXT: }
0x060000c7, 0x00100032, 0x00000000, 0x801004e6, 0x000000c1, 0x00000001

// -----

// CHECK-LABEL: dxsa.module {
// CHECK-NEXT: dxsa.dmov precise <x, y> r<0, <x, y>>, r<1>
// CHECK-NEXT: }
0x051800c7, 0x00100032, 0x00000000, 0x00100e46, 0x00000001

// -----

// CHECK-LABEL: dxsa.module {
// CHECK-NEXT: dxsa.dmov_sat r<0, <x, y>>, -|r<1, <z, w, x, y>>|
// CHECK-NEXT: }
0x060020c7, 0x00100032, 0x00000000, 0x801004e6, 0x000000c1, 0x00000001

// -----

// CHECK-LABEL: dxsa.module {
// CHECK-NEXT: dxsa.dmov_sat precise <x, y> r<0, <x, y>>, r<1>
// CHECK-NEXT: }
0x051820c7, 0x00100032, 0x00000000, 0x00100e46, 0x00000001

// -----

// CHECK-LABEL: dxsa.module {
// CHECK-NEXT: dxsa.dmovc r<0>, r<1>, r<2>, r<3>
// CHECK-NEXT: }
0x090000c8, 0x001000f2, 0x00000000, 0x00100e46, 0x00000001, 0x00100e46, 0x00000002, 0x00100e46, 0x00000003

// -----

// CHECK-LABEL: dxsa.module {
// CHECK-NEXT: dxsa.dmovc_sat r<0, <x, y>>, r<1>, -|r<2, <z, w, x, y>>|, r<3>
// CHECK-NEXT: }
0x0a0020c8, 0x00100032, 0x00000000, 0x00100e46, 0x00000001, 0x801004e6, 0x000000c1, 0x00000002, 0x00100e46, 0x00000003

// -----

// CHECK-LABEL: dxsa.module {
// CHECK-NEXT: dxsa.dmovc precise <x, y, z, w> r<0>, r<1>, r<2>, r<3>
// CHECK-NEXT: }
0x097800c8, 0x001000f2, 0x00000000, 0x00100e46, 0x00000001, 0x00100e46, 0x00000002, 0x00100e46, 0x00000003

// -----

// CHECK-LABEL: dxsa.module {
// CHECK-NEXT: dxsa.dmovc_sat precise <x, y> r<0>, r<1>, r<2>, r<3>
// CHECK-NEXT: }
0x091820c8, 0x001000f2, 0x00000000, 0x00100e46, 0x00000001, 0x00100e46, 0x00000002, 0x00100e46, 0x00000003

// -----

// CHECK-LABEL: dxsa.module {
// CHECK-NEXT: dxsa.swapc r<0>, r<1>, r<2>, r<3>, r<4>
// CHECK-NEXT: }
0x0b00008e, 0x001000f2, 0x00000000, 0x001000f2, 0x00000001, 0x00100e46, 0x00000002, 0x00100e46, 0x00000003, 0x00100e46, 0x00000004

// -----

// CHECK-LABEL: dxsa.module {
// CHECK-NEXT: dxsa.swapc r<0, <x, y>>, r<1, <z, w>>, r<2>, -r<3>, |r<4>|
// CHECK-NEXT: }
0x0d00008e, 0x00100032, 0x00000000, 0x001000c2, 0x00000001, 0x00100e46, 0x00000002, 0x80100e46, 0x00000041, 0x00000003, 0x80100e46, 0x00000081, 0x00000004

// -----

// CHECK-LABEL: dxsa.module {
// CHECK-NEXT: dxsa.swapc precise <x, y, z, w> r<0>, r<1>, r<2>, r<3>, r<4>
// CHECK-NEXT: }
0x0b78008e, 0x001000f2, 0x00000000, 0x001000f2, 0x00000001, 0x00100e46, 0x00000002, 0x00100e46, 0x00000003, 0x00100e46, 0x00000004