Skip to content
Merged
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
1 change: 1 addition & 0 deletions python/test/unit/language/test_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -1669,6 +1669,7 @@ def kernel(X, Z, BITCAST: tl.constexpr, SIZE: tl.constexpr, ARG_HASH: tl.constex
np.testing.assert_allclose(z_ref, to_numpy(z_tri), rtol=0, atol=0)


@pytest.mark.cpu
@pytest.mark.interpreter
@pytest.mark.parametrize("dtype_str, num_warps",
[(dtype_str, num_warps) for dtype_str in int_dtypes + float_dtypes for num_warps in [4, 8]])
Expand Down
20 changes: 20 additions & 0 deletions third_party/cpu/lib/TritonToTritonCPU/ConvertElementwiseOps.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ class ElementwiseOpConversionTarget : public ConversionTarget {
addIllegalOp<triton::ClampFOp>();
addIllegalOp<triton::TransOp>();
addIllegalOp<triton::JoinOp>();
addIllegalOp<triton::CatOp>();
}
};

Expand Down Expand Up @@ -236,6 +237,24 @@ struct JoinOpConversion : public OpConversionPattern<triton::JoinOp> {
}
};

struct CatOpConversion : public OpConversionPattern<triton::CatOp> {
using OpConversionPattern::OpConversionPattern;

LogicalResult
matchAndRewrite(triton::CatOp op, OpAdaptor adaptor,
ConversionPatternRewriter &rewriter) const override {
auto loc = op.getLoc();
auto lhs = rewriter.getRemappedValue(op.getLhs());
auto rhs = rewriter.getRemappedValue(op.getRhs());
auto lhsTy = dyn_cast<VectorType>(lhs.getType());
auto rhsTy = dyn_cast<VectorType>(rhs.getType());
SmallVector<int64_t> indices(lhsTy.getShape()[0] + rhsTy.getShape()[0]);
std::iota(indices.begin(), indices.end(), 0);
rewriter.replaceOpWithNewOp<vector::ShuffleOp>(op, lhs, rhs, indices);
return success();
}
};

struct ConvertElementwiseOps
: public triton::impl::ConvertElementwiseOpsBase<ConvertElementwiseOps> {
using ConvertElementwiseOpsBase::ConvertElementwiseOpsBase;
Expand Down Expand Up @@ -320,6 +339,7 @@ struct ConvertElementwiseOps
patterns.add<ClampFOpConversion>(typeConverter, context);
patterns.add<TransOpConversion>(typeConverter, context);
patterns.add<JoinOpConversion>(typeConverter, context);
patterns.add<CatOpConversion>(typeConverter, context);

if (failed(applyPartialConversion(mod, convTarget, std::move(patterns))))
return signalPassFailure();
Expand Down