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

Add topk operator #66

Merged
merged 11 commits into from
Aug 21, 2024
Merged

Add topk operator #66

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a2b0fd6
Add topk operator
mgehre-amd Aug 15, 2024
c9dfb61
Add the Indice to the outputs
josel-amd Aug 20, 2024
37321a5
Use K as an operand instead of attribute
josel-amd Aug 20, 2024
dd3f01a
Do not make constant k mandatory
josel-amd Aug 20, 2024
5b11a93
Test topk with an argument
josel-amd Aug 20, 2024
2316e7e
Add support for dynamic topk
josel-amd Aug 20, 2024
e3b57e5
k must be <= dimSize
josel-amd Aug 20, 2024
9d060f9
Remove unused include
josel-amd Aug 20, 2024
9939251
Relax result type comparison
josel-amd Aug 21, 2024
81503ea
Add a test case
josel-amd Aug 21, 2024
e995188
Fix failing test
josel-amd Aug 21, 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
26 changes: 14 additions & 12 deletions lib/Dialect/XTenNN/IR/XTenNNOps.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include "mlir/Dialect/Arith/IR/Arith.h"
#include "mlir/IR/Builders.h"
#include "mlir/IR/BuiltinOps.h"
#include "mlir/IR/BuiltinTypeInterfaces.h"
#include "mlir/IR/OpImplementation.h"
#include "mlir/IR/SymbolTable.h"
#include "mlir/IR/TypeUtilities.h"
Expand Down Expand Up @@ -530,7 +531,11 @@ LogicalResult amd::xten_nn::ResizeOp::verify() {
return success();
}

std::optional<uint64_t> getConstantK(Operation *op) {
std::optional<uint64_t> getConstantK(Value k) {
auto *op = k.getDefiningOp();
if (!op) {
return {};
}
auto constantOp = dyn_cast<arith::ConstantOp>(op);
if (!constantOp)
return {};
Expand All @@ -551,24 +556,21 @@ LogicalResult TopK::inferReturnTypeComponents(
if (axis >= (uint64_t)inTy.getRank()) {
return emitOptionalError(location, "expected axis <= rank of input");
}
auto dimSize = inTy.getDimSize(axis);
auto k = getConstantK(adaptor.getK().getDefiningOp());

if (!k) {
return emitOptionalError(location, "expected constant k");
auto dimSize = inTy.getDimSize(axis);
auto k = getConstantK(adaptor.getK());
if (k) {
if ((uint64_t)dimSize < *k) {
return emitOptionalError(location, "expected k <= dimension size");
}
}

if (dimSize < 0) {
// TODO: Support negative dimSize
return emitOptionalError(location, "expected positive axis");
}

if ((uint64_t)dimSize < *k) {
return emitOptionalError(location, "expected k <= dimension size");
return emitOptionalError(location, "expected positive dimSize");
}

SmallVector<int64_t> resultShape{inTy.getShape()};
resultShape[axis] = *k;
resultShape[axis] = k ? *k : ShapedType::kDynamic;

inferredReturnShapes.push_back(
ShapedTypeComponents(resultShape, inTy.getElementType()));
Expand Down
9 changes: 9 additions & 0 deletions test/Dialect/XTenNN/ops.mlir
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,12 @@ func.func @topk(%arg0: tensor<10x8xf32>) {
// CHECK: xten_nn.topk(%arg0 : tensor<10x8xf32>, %[[C7]] : i64) {axis = 1 : i64, largest = true, sorted = true} -> tensor<10x7xf32>, tensor<10x7xi64>
return
}

// -----

// CHECK-LABEL: topk_arg
func.func @topk_arg(%arg0: tensor<10x8xf32>, %k: i64) {
xten_nn.topk(%arg0 : tensor<10x8xf32>, %k : i64) {axis = 1 : i64, largest = true, sorted = true} -> tensor<10x?xf32>, tensor<10x?xi64>
// CHECK: xten_nn.topk(%arg0 : tensor<10x8xf32>, %arg1 : i64) {axis = 1 : i64, largest = true, sorted = true} -> tensor<10x?xf32>, tensor<10x?xi64>
return
}
Loading