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
40 changes: 38 additions & 2 deletions python/tvm/relax/dpl/pattern.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@
# pylint: disable=pointless-statement

import typing
from typing import Dict, List, Optional, Tuple, Union
from typing import Dict, List, Optional, Tuple, Union, Callable

import tvm
import tvm._ffi as tvm_ffi
Expand All@@ -31,7 +31,7 @@
from ...ir import make_node
from ...ir.base import Node
from ...runtime import Object
from ..expr import Expr, Var
from ..expr import Expr, Var, Function
from . import _ffi as ffi


Expand DownExpand Up@@ -1115,3 +1115,39 @@ def make_fused_bias_activation_pattern(op_name, with_bias=False, activation=None
return is_op(activation)(out)

return out


def rewrite(
pattern: DFPattern, rewriter: Callable[[Expr, Dict[DFPattern, Expr]], Expr], func: Function
) -> Function:
"""
Rewrite a function with the given pattern and the rewriter function.

Parameters
----------
pattern: DFPattern
The pattern to match.

rewriter: Callable[[Expr, Dict[DFPattern, Expr]], Expr]
The function to be called on a successful matching for rewriting. Given the matched
call node and the map of patterns and matched expressions, it should return a new call node
to replace the original one or the original matched call node as is.

For example, to replace x + x with 2 * x, we can write the rewriter as follows:
```
x = wildcard()
pattern = is_op("relax.add")(x, x)

def rewriter(orig, matchings):
return R.multiply(matchings[x], R.const(2, "float32"))
```

func: Function
The function to rewrite.

Returns
-------
rewritten_func: Function
The rewritten or the input function, depending on the pattern matching result.
"""
return ffi.rewrite(pattern, rewriter, func)
48 changes: 48 additions & 0 deletions src/relax/ir/dataflow_matcher.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -766,5 +766,53 @@ Map<DFPattern, Var> MatchGraph(const PatternContext& ctx, const DataflowBlock& d

TVM_REGISTER_GLOBAL("relax.dpl.match_dfb").set_body_typed(MatchGraph);

/*!
* \brief Apply pattern matching to each call node and replace matching ones with the output of
* a user-provided rewriter function.
*/
class PatternRewriter : ExprMutator {
public:
using ExprMutator::VisitExpr_;

PatternRewriter(DFPattern pat, PackedFunc rewriter_func)
: pattern_(pat), rewriter_func_(rewriter_func) {}

static Expr Run(DFPattern pat, PackedFunc rewriter_func, Function f) {
PatternRewriter rewriter(pat, rewriter_func);
return RemoveAllUnused(Downcast<Function>(rewriter.VisitExpr(f)));
}

void VisitBinding_(const VarBindingNode* binding) final {
bindings_.Set(binding->var, binding->value);
ExprMutator::VisitBinding_(binding);
if (auto it = memo_.find(binding->value.get()); it != memo_.end()) {
// We need to update the binding to pass to ExtractMatchedExpr, so that the rewritten
// expression can be subject to further pattern matchings.
bindings_.Set(binding->var, it->second);
}
}

Expr VisitExpr_(const CallNode* call_node) final {
auto call = ExprMutator::VisitExpr_(call_node);
if (auto matches_opt = ExtractMatchedExpr(pattern_, call, bindings_)) {
auto rewriten_expr = rewriter_func_(call, matches_opt.value());
memo_[call_node] = rewriten_expr;
return rewriten_expr;
}
return call;
}

private:
DFPattern pattern_;
PackedFunc rewriter_func_;
Map<Var, Expr> bindings_;
std::unordered_map<const Object*, Expr> memo_;
};

TVM_REGISTER_GLOBAL("relax.dpl.rewrite")
.set_body_typed([](DFPattern pat, PackedFunc rewriter, Function f) {
return PatternRewriter::Run(pat, rewriter, f);
});

} // namespace relax
} // namespace tvm
118 changes: 118 additions & 0 deletions tests/python/relax/test_dataflow_pattern.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -888,5 +888,123 @@ def simple_chain(x: R.Tensor((32, 32), "float32")) -> R.Tensor:
assert not ctx1.match_dfb(simple_chain.body.blocks[0])


def test_rewrite_simple():
@R.function
def main(x: R.Tensor((16, 16), "float32")) -> R.Tensor((16, 16), "float32"):
with R.dataflow():
x2 = R.add(x, x)
x4 = R.add(x2, x2)
R.output(x4)
return x4

@R.function
def expected1(x: R.Tensor((16, 16), dtype="float32")) -> R.Tensor((16, 16), dtype="float32"):
with R.dataflow():
lv: R.Tensor((16, 16), dtype="float32") = R.multiply(x, R.const(2, "float32"))
x4: R.Tensor((16, 16), dtype="float32") = R.multiply(lv, R.const(2, "float32"))
R.output(x4)
return x4

@R.function
def expected2(x: R.Tensor((16, 16), dtype="float32")) -> R.Tensor((16, 16), dtype="float32"):
with R.dataflow():
x4: R.Tensor((16, 16), dtype="float32") = R.multiply(x, R.const(4, "float32"))
R.output(x4)
return x4

x = wildcard()
pattern = is_op("relax.add")(x, x)

def rewriter(_, matchings):
return R.multiply(matchings[x], R.const(2, "float32"))

rewritten = rewrite(pattern, rewriter, main)
tvm.ir.assert_structural_equal(rewritten, expected1)

add1 = is_op("relax.add")(x, x)
pattern = is_op("relax.add")(add1, add1)

def rewriter(_, matchings):
return R.multiply(matchings[x], R.const(4, "float32"))

rewritten = rewrite(pattern, rewriter, main)
tvm.ir.assert_structural_equal(rewritten, expected2)

# No rewriting, return the original call node as is
def rewriter(orig, _):
return orig

rewritten = rewrite(pattern, rewriter, main)
tvm.ir.assert_structural_equal(rewritten, main)


def test_rewrite_attention():
@R.function
def main(
Q: R.Tensor((2, 4096, 8, 40), "float32"),
K: R.Tensor((2, 4096, 8, 40), "float32"),
V: R.Tensor((2, 4096, 8, 40), "float32"),
) -> R.Tensor((2, 4096, 8, 40), "float32"):
with R.dataflow():
lv58 = R.permute_dims(Q, axes=[0, 2, 1, 3])
lv59 = R.reshape(lv58, R.shape([16, 4096, 40]))

lv61 = R.permute_dims(K, axes=[0, 2, 1, 3])
lv62 = R.reshape(lv61, R.shape([16, 4096, 40]))

lv64 = R.permute_dims(V, axes=[0, 2, 1, 3])
lv65 = R.reshape(lv64, R.shape([16, 4096, 40]))

lv62_transposed = R.permute_dims(lv62, axes=[0, 2, 1])
lv3_1 = R.matmul(lv59, lv62_transposed)
lv68 = R.multiply(lv3_1, R.const(0.15811388194561005, "float32"))
lv69 = R.nn.softmax(lv68, axis=-1)
lv_3 = R.matmul(lv69, lv65)

lv71 = R.reshape(lv_3, R.shape([2, 8, 4096, 40]))
lv72 = R.permute_dims(lv71, axes=[0, 2, 1, 3])
R.output(lv72)

return lv72

@R.function
def expected(
Q: R.Tensor((2, 4096, 8, 40), dtype="float32"),
K: R.Tensor((2, 4096, 8, 40), dtype="float32"),
V: R.Tensor((2, 4096, 8, 40), dtype="float32"),
) -> R.Tensor((2, 4096, 8, 40), dtype="float32"):
with R.dataflow():
lv72: R.Tensor((2, 4096, 8, 40), dtype="float32") = R.nn.attention(Q, V, K)
R.output(lv72)
return lv72

def BSNH_to_BSH(tensor):
return is_op("relax.reshape")(is_op("relax.permute_dims")(tensor), wildcard())

def BSH_to_BSNH(tensor):
return is_op("relax.permute_dims")(is_op("relax.reshape")(tensor, wildcard()))

Q = wildcard()
K = wildcard()
V = wildcard()

Q_3D = BSNH_to_BSH(Q)
V_3D = BSNH_to_BSH(V)
K_3D = BSNH_to_BSH(K)

matmul1 = is_op("relax.matmul")(Q_3D, is_op("relax.permute_dims")(V_3D))
multiply = is_op("relax.multiply")(matmul1, is_const())
softmax = is_op("relax.nn.softmax")(multiply)
matmul2 = is_op("relax.matmul")(softmax, K_3D)

pattern = BSH_to_BSNH(matmul2)

def rewriter(_, matchings):
return R.nn.attention(matchings[Q], matchings[K], matchings[V])
Comment thread
masahi marked this conversation as resolved.

rewritten = rewrite(pattern, rewriter, main)
tvm.ir.assert_structural_equal(rewritten, expected)


if __name__ == "__main__":
tvm.testing.main()
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
[Unity] Support pattern-based rewriting by masahi · Pull Request #14312 · apache/tvm · GitHub
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
40 changes: 38 additions & 2 deletions python/tvm/relax/dpl/pattern.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@
# pylint: disable=pointless-statement

import typing
from typing import Dict, List, Optional, Tuple, Union
from typing import Dict, List, Optional, Tuple, Union, Callable

import tvm
import tvm._ffi as tvm_ffi
Expand All@@ -31,7 +31,7 @@
from ...ir import make_node
from ...ir.base import Node
from ...runtime import Object
from ..expr import Expr, Var
from ..expr import Expr, Var, Function
from . import _ffi as ffi


Expand DownExpand Up@@ -1115,3 +1115,39 @@ def make_fused_bias_activation_pattern(op_name, with_bias=False, activation=None
return is_op(activation)(out)

return out


def rewrite(
pattern: DFPattern, rewriter: Callable[[Expr, Dict[DFPattern, Expr]], Expr], func: Function
) -> Function:
"""
Rewrite a function with the given pattern and the rewriter function.

Parameters
----------
pattern: DFPattern
The pattern to match.

rewriter: Callable[[Expr, Dict[DFPattern, Expr]], Expr]
The function to be called on a successful matching for rewriting. Given the matched
call node and the map of patterns and matched expressions, it should return a new call node
to replace the original one or the original matched call node as is.

For example, to replace x + x with 2 * x, we can write the rewriter as follows:
```
x = wildcard()
pattern = is_op("relax.add")(x, x)

def rewriter(orig, matchings):
return R.multiply(matchings[x], R.const(2, "float32"))
```

func: Function
The function to rewrite.

Returns
-------
rewritten_func: Function
The rewritten or the input function, depending on the pattern matching result.
"""
return ffi.rewrite(pattern, rewriter, func)
48 changes: 48 additions & 0 deletions src/relax/ir/dataflow_matcher.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -766,5 +766,53 @@ Map<DFPattern, Var> MatchGraph(const PatternContext& ctx, const DataflowBlock& d

TVM_REGISTER_GLOBAL("relax.dpl.match_dfb").set_body_typed(MatchGraph);

/*!
* \brief Apply pattern matching to each call node and replace matching ones with the output of
* a user-provided rewriter function.
*/
class PatternRewriter : ExprMutator {
public:
using ExprMutator::VisitExpr_;

PatternRewriter(DFPattern pat, PackedFunc rewriter_func)
: pattern_(pat), rewriter_func_(rewriter_func) {}

static Expr Run(DFPattern pat, PackedFunc rewriter_func, Function f) {
PatternRewriter rewriter(pat, rewriter_func);
return RemoveAllUnused(Downcast<Function>(rewriter.VisitExpr(f)));
}

void VisitBinding_(const VarBindingNode* binding) final {
bindings_.Set(binding->var, binding->value);
ExprMutator::VisitBinding_(binding);
if (auto it = memo_.find(binding->value.get()); it != memo_.end()) {
// We need to update the binding to pass to ExtractMatchedExpr, so that the rewritten
// expression can be subject to further pattern matchings.
bindings_.Set(binding->var, it->second);
}
}

Expr VisitExpr_(const CallNode* call_node) final {
auto call = ExprMutator::VisitExpr_(call_node);
if (auto matches_opt = ExtractMatchedExpr(pattern_, call, bindings_)) {
auto rewriten_expr = rewriter_func_(call, matches_opt.value());
memo_[call_node] = rewriten_expr;
return rewriten_expr;
}
return call;
}

private:
DFPattern pattern_;
PackedFunc rewriter_func_;
Map<Var, Expr> bindings_;
std::unordered_map<const Object*, Expr> memo_;
};

TVM_REGISTER_GLOBAL("relax.dpl.rewrite")
.set_body_typed([](DFPattern pat, PackedFunc rewriter, Function f) {
return PatternRewriter::Run(pat, rewriter, f);
});

} // namespace relax
} // namespace tvm
118 changes: 118 additions & 0 deletions tests/python/relax/test_dataflow_pattern.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -888,5 +888,123 @@ def simple_chain(x: R.Tensor((32, 32), "float32")) -> R.Tensor:
assert not ctx1.match_dfb(simple_chain.body.blocks[0])


def test_rewrite_simple():
@R.function
def main(x: R.Tensor((16, 16), "float32")) -> R.Tensor((16, 16), "float32"):
with R.dataflow():
x2 = R.add(x, x)
x4 = R.add(x2, x2)
R.output(x4)
return x4

@R.function
def expected1(x: R.Tensor((16, 16), dtype="float32")) -> R.Tensor((16, 16), dtype="float32"):
with R.dataflow():
lv: R.Tensor((16, 16), dtype="float32") = R.multiply(x, R.const(2, "float32"))
x4: R.Tensor((16, 16), dtype="float32") = R.multiply(lv, R.const(2, "float32"))
R.output(x4)
return x4

@R.function
def expected2(x: R.Tensor((16, 16), dtype="float32")) -> R.Tensor((16, 16), dtype="float32"):
with R.dataflow():
x4: R.Tensor((16, 16), dtype="float32") = R.multiply(x, R.const(4, "float32"))
R.output(x4)
return x4

x = wildcard()
pattern = is_op("relax.add")(x, x)

def rewriter(_, matchings):
return R.multiply(matchings[x], R.const(2, "float32"))

rewritten = rewrite(pattern, rewriter, main)
tvm.ir.assert_structural_equal(rewritten, expected1)

add1 = is_op("relax.add")(x, x)
pattern = is_op("relax.add")(add1, add1)

def rewriter(_, matchings):
return R.multiply(matchings[x], R.const(4, "float32"))

rewritten = rewrite(pattern, rewriter, main)
tvm.ir.assert_structural_equal(rewritten, expected2)

# No rewriting, return the original call node as is
def rewriter(orig, _):
return orig

rewritten = rewrite(pattern, rewriter, main)
tvm.ir.assert_structural_equal(rewritten, main)


def test_rewrite_attention():
@R.function
def main(
Q: R.Tensor((2, 4096, 8, 40), "float32"),
K: R.Tensor((2, 4096, 8, 40), "float32"),
V: R.Tensor((2, 4096, 8, 40), "float32"),
) -> R.Tensor((2, 4096, 8, 40), "float32"):
with R.dataflow():
lv58 = R.permute_dims(Q, axes=[0, 2, 1, 3])
lv59 = R.reshape(lv58, R.shape([16, 4096, 40]))

lv61 = R.permute_dims(K, axes=[0, 2, 1, 3])
lv62 = R.reshape(lv61, R.shape([16, 4096, 40]))

lv64 = R.permute_dims(V, axes=[0, 2, 1, 3])
lv65 = R.reshape(lv64, R.shape([16, 4096, 40]))

lv62_transposed = R.permute_dims(lv62, axes=[0, 2, 1])
lv3_1 = R.matmul(lv59, lv62_transposed)
lv68 = R.multiply(lv3_1, R.const(0.15811388194561005, "float32"))
lv69 = R.nn.softmax(lv68, axis=-1)
lv_3 = R.matmul(lv69, lv65)

lv71 = R.reshape(lv_3, R.shape([2, 8, 4096, 40]))
lv72 = R.permute_dims(lv71, axes=[0, 2, 1, 3])
R.output(lv72)

return lv72

@R.function
def expected(
Q: R.Tensor((2, 4096, 8, 40), dtype="float32"),
K: R.Tensor((2, 4096, 8, 40), dtype="float32"),
V: R.Tensor((2, 4096, 8, 40), dtype="float32"),
) -> R.Tensor((2, 4096, 8, 40), dtype="float32"):
with R.dataflow():
lv72: R.Tensor((2, 4096, 8, 40), dtype="float32") = R.nn.attention(Q, V, K)
R.output(lv72)
return lv72

def BSNH_to_BSH(tensor):
return is_op("relax.reshape")(is_op("relax.permute_dims")(tensor), wildcard())

def BSH_to_BSNH(tensor):
return is_op("relax.permute_dims")(is_op("relax.reshape")(tensor, wildcard()))

Q = wildcard()
K = wildcard()
V = wildcard()

Q_3D = BSNH_to_BSH(Q)
V_3D = BSNH_to_BSH(V)
K_3D = BSNH_to_BSH(K)

matmul1 = is_op("relax.matmul")(Q_3D, is_op("relax.permute_dims")(V_3D))
multiply = is_op("relax.multiply")(matmul1, is_const())
softmax = is_op("relax.nn.softmax")(multiply)
matmul2 = is_op("relax.matmul")(softmax, K_3D)

pattern = BSH_to_BSNH(matmul2)

def rewriter(_, matchings):
return R.nn.attention(matchings[Q], matchings[K], matchings[V])
Comment thread
masahi marked this conversation as resolved.

rewritten = rewrite(pattern, rewriter, main)
tvm.ir.assert_structural_equal(rewritten, expected)


if __name__ == "__main__":
tvm.testing.main()
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' [Unity] Support pattern-based rewriting by masahi · Pull Request #14312 · apache/tvm · GitHub
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
40 changes: 38 additions & 2 deletions python/tvm/relax/dpl/pattern.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@
# pylint: disable=pointless-statement

import typing
from typing import Dict, List, Optional, Tuple, Union
from typing import Dict, List, Optional, Tuple, Union, Callable

import tvm
import tvm._ffi as tvm_ffi
Expand All@@ -31,7 +31,7 @@
from ...ir import make_node
from ...ir.base import Node
from ...runtime import Object
from ..expr import Expr, Var
from ..expr import Expr, Var, Function
from . import _ffi as ffi


Expand DownExpand Up@@ -1115,3 +1115,39 @@ def make_fused_bias_activation_pattern(op_name, with_bias=False, activation=None
return is_op(activation)(out)

return out


def rewrite(
pattern: DFPattern, rewriter: Callable[[Expr, Dict[DFPattern, Expr]], Expr], func: Function
) -> Function:
"""
Rewrite a function with the given pattern and the rewriter function.

Parameters
----------
pattern: DFPattern
The pattern to match.

rewriter: Callable[[Expr, Dict[DFPattern, Expr]], Expr]
The function to be called on a successful matching for rewriting. Given the matched
call node and the map of patterns and matched expressions, it should return a new call node
to replace the original one or the original matched call node as is.

For example, to replace x + x with 2 * x, we can write the rewriter as follows:
```
x = wildcard()
pattern = is_op("relax.add")(x, x)

def rewriter(orig, matchings):
return R.multiply(matchings[x], R.const(2, "float32"))
```

func: Function
The function to rewrite.

Returns
-------
rewritten_func: Function
The rewritten or the input function, depending on the pattern matching result.
"""
return ffi.rewrite(pattern, rewriter, func)
48 changes: 48 additions & 0 deletions src/relax/ir/dataflow_matcher.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -766,5 +766,53 @@ Map<DFPattern, Var> MatchGraph(const PatternContext& ctx, const DataflowBlock& d

TVM_REGISTER_GLOBAL("relax.dpl.match_dfb").set_body_typed(MatchGraph);

/*!
* \brief Apply pattern matching to each call node and replace matching ones with the output of
* a user-provided rewriter function.
*/
class PatternRewriter : ExprMutator {
public:
using ExprMutator::VisitExpr_;

PatternRewriter(DFPattern pat, PackedFunc rewriter_func)
: pattern_(pat), rewriter_func_(rewriter_func) {}

static Expr Run(DFPattern pat, PackedFunc rewriter_func, Function f) {
PatternRewriter rewriter(pat, rewriter_func);
return RemoveAllUnused(Downcast<Function>(rewriter.VisitExpr(f)));
}

void VisitBinding_(const VarBindingNode* binding) final {
bindings_.Set(binding->var, binding->value);
ExprMutator::VisitBinding_(binding);
if (auto it = memo_.find(binding->value.get()); it != memo_.end()) {
// We need to update the binding to pass to ExtractMatchedExpr, so that the rewritten
// expression can be subject to further pattern matchings.
bindings_.Set(binding->var, it->second);
}
}

Expr VisitExpr_(const CallNode* call_node) final {
auto call = ExprMutator::VisitExpr_(call_node);
if (auto matches_opt = ExtractMatchedExpr(pattern_, call, bindings_)) {
auto rewriten_expr = rewriter_func_(call, matches_opt.value());
memo_[call_node] = rewriten_expr;
return rewriten_expr;
}
return call;
}

private:
DFPattern pattern_;
PackedFunc rewriter_func_;
Map<Var, Expr> bindings_;
std::unordered_map<const Object*, Expr> memo_;
};

TVM_REGISTER_GLOBAL("relax.dpl.rewrite")
.set_body_typed([](DFPattern pat, PackedFunc rewriter, Function f) {
return PatternRewriter::Run(pat, rewriter, f);
});

} // namespace relax
} // namespace tvm
118 changes: 118 additions & 0 deletions tests/python/relax/test_dataflow_pattern.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -888,5 +888,123 @@ def simple_chain(x: R.Tensor((32, 32), "float32")) -> R.Tensor:
assert not ctx1.match_dfb(simple_chain.body.blocks[0])


def test_rewrite_simple():
@R.function
def main(x: R.Tensor((16, 16), "float32")) -> R.Tensor((16, 16), "float32"):
with R.dataflow():
x2 = R.add(x, x)
x4 = R.add(x2, x2)
R.output(x4)
return x4

@R.function
def expected1(x: R.Tensor((16, 16), dtype="float32")) -> R.Tensor((16, 16), dtype="float32"):
with R.dataflow():
lv: R.Tensor((16, 16), dtype="float32") = R.multiply(x, R.const(2, "float32"))
x4: R.Tensor((16, 16), dtype="float32") = R.multiply(lv, R.const(2, "float32"))
R.output(x4)
return x4

@R.function
def expected2(x: R.Tensor((16, 16), dtype="float32")) -> R.Tensor((16, 16), dtype="float32"):
with R.dataflow():
x4: R.Tensor((16, 16), dtype="float32") = R.multiply(x, R.const(4, "float32"))
R.output(x4)
return x4

x = wildcard()
pattern = is_op("relax.add")(x, x)

def rewriter(_, matchings):
return R.multiply(matchings[x], R.const(2, "float32"))

rewritten = rewrite(pattern, rewriter, main)
tvm.ir.assert_structural_equal(rewritten, expected1)

add1 = is_op("relax.add")(x, x)
pattern = is_op("relax.add")(add1, add1)

def rewriter(_, matchings):
return R.multiply(matchings[x], R.const(4, "float32"))

rewritten = rewrite(pattern, rewriter, main)
tvm.ir.assert_structural_equal(rewritten, expected2)

# No rewriting, return the original call node as is
def rewriter(orig, _):
return orig

rewritten = rewrite(pattern, rewriter, main)
tvm.ir.assert_structural_equal(rewritten, main)


def test_rewrite_attention():
@R.function
def main(
Q: R.Tensor((2, 4096, 8, 40), "float32"),
K: R.Tensor((2, 4096, 8, 40), "float32"),
V: R.Tensor((2, 4096, 8, 40), "float32"),
) -> R.Tensor((2, 4096, 8, 40), "float32"):
with R.dataflow():
lv58 = R.permute_dims(Q, axes=[0, 2, 1, 3])
lv59 = R.reshape(lv58, R.shape([16, 4096, 40]))

lv61 = R.permute_dims(K, axes=[0, 2, 1, 3])
lv62 = R.reshape(lv61, R.shape([16, 4096, 40]))

lv64 = R.permute_dims(V, axes=[0, 2, 1, 3])
lv65 = R.reshape(lv64, R.shape([16, 4096, 40]))

lv62_transposed = R.permute_dims(lv62, axes=[0, 2, 1])
lv3_1 = R.matmul(lv59, lv62_transposed)
lv68 = R.multiply(lv3_1, R.const(0.15811388194561005, "float32"))
lv69 = R.nn.softmax(lv68, axis=-1)
lv_3 = R.matmul(lv69, lv65)

lv71 = R.reshape(lv_3, R.shape([2, 8, 4096, 40]))
lv72 = R.permute_dims(lv71, axes=[0, 2, 1, 3])
R.output(lv72)

return lv72

@R.function
def expected(
Q: R.Tensor((2, 4096, 8, 40), dtype="float32"),
K: R.Tensor((2, 4096, 8, 40), dtype="float32"),
V: R.Tensor((2, 4096, 8, 40), dtype="float32"),
) -> R.Tensor((2, 4096, 8, 40), dtype="float32"):
with R.dataflow():
lv72: R.Tensor((2, 4096, 8, 40), dtype="float32") = R.nn.attention(Q, V, K)
R.output(lv72)
return lv72

def BSNH_to_BSH(tensor):
return is_op("relax.reshape")(is_op("relax.permute_dims")(tensor), wildcard())

def BSH_to_BSNH(tensor):
return is_op("relax.permute_dims")(is_op("relax.reshape")(tensor, wildcard()))

Q = wildcard()
K = wildcard()
V = wildcard()

Q_3D = BSNH_to_BSH(Q)
V_3D = BSNH_to_BSH(V)
K_3D = BSNH_to_BSH(K)

matmul1 = is_op("relax.matmul")(Q_3D, is_op("relax.permute_dims")(V_3D))
multiply = is_op("relax.multiply")(matmul1, is_const())
softmax = is_op("relax.nn.softmax")(multiply)
matmul2 = is_op("relax.matmul")(softmax, K_3D)

pattern = BSH_to_BSNH(matmul2)

def rewriter(_, matchings):
return R.nn.attention(matchings[Q], matchings[K], matchings[V])
Comment thread
masahi marked this conversation as resolved.

rewritten = rewrite(pattern, rewriter, main)
tvm.ir.assert_structural_equal(rewritten, expected)


if __name__ == "__main__":
tvm.testing.main()
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' [Unity] Support pattern-based rewriting by masahi · Pull Request #14312 · apache/tvm · GitHub
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
40 changes: 38 additions & 2 deletions python/tvm/relax/dpl/pattern.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@
# pylint: disable=pointless-statement

import typing
from typing import Dict, List, Optional, Tuple, Union
from typing import Dict, List, Optional, Tuple, Union, Callable

import tvm
import tvm._ffi as tvm_ffi
Expand All@@ -31,7 +31,7 @@
from ...ir import make_node
from ...ir.base import Node
from ...runtime import Object
from ..expr import Expr, Var
from ..expr import Expr, Var, Function
from . import _ffi as ffi


Expand DownExpand Up@@ -1115,3 +1115,39 @@ def make_fused_bias_activation_pattern(op_name, with_bias=False, activation=None
return is_op(activation)(out)

return out


def rewrite(
pattern: DFPattern, rewriter: Callable[[Expr, Dict[DFPattern, Expr]], Expr], func: Function
) -> Function:
"""
Rewrite a function with the given pattern and the rewriter function.

Parameters
----------
pattern: DFPattern
The pattern to match.

rewriter: Callable[[Expr, Dict[DFPattern, Expr]], Expr]
The function to be called on a successful matching for rewriting. Given the matched
call node and the map of patterns and matched expressions, it should return a new call node
to replace the original one or the original matched call node as is.

For example, to replace x + x with 2 * x, we can write the rewriter as follows:
```
x = wildcard()
pattern = is_op("relax.add")(x, x)

def rewriter(orig, matchings):
return R.multiply(matchings[x], R.const(2, "float32"))
```

func: Function
The function to rewrite.

Returns
-------
rewritten_func: Function
The rewritten or the input function, depending on the pattern matching result.
"""
return ffi.rewrite(pattern, rewriter, func)
48 changes: 48 additions & 0 deletions src/relax/ir/dataflow_matcher.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -766,5 +766,53 @@ Map<DFPattern, Var> MatchGraph(const PatternContext& ctx, const DataflowBlock& d

TVM_REGISTER_GLOBAL("relax.dpl.match_dfb").set_body_typed(MatchGraph);

/*!
* \brief Apply pattern matching to each call node and replace matching ones with the output of
* a user-provided rewriter function.
*/
class PatternRewriter : ExprMutator {
public:
using ExprMutator::VisitExpr_;

PatternRewriter(DFPattern pat, PackedFunc rewriter_func)
: pattern_(pat), rewriter_func_(rewriter_func) {}

static Expr Run(DFPattern pat, PackedFunc rewriter_func, Function f) {
PatternRewriter rewriter(pat, rewriter_func);
return RemoveAllUnused(Downcast<Function>(rewriter.VisitExpr(f)));
}

void VisitBinding_(const VarBindingNode* binding) final {
bindings_.Set(binding->var, binding->value);
ExprMutator::VisitBinding_(binding);
if (auto it = memo_.find(binding->value.get()); it != memo_.end()) {
// We need to update the binding to pass to ExtractMatchedExpr, so that the rewritten
// expression can be subject to further pattern matchings.
bindings_.Set(binding->var, it->second);
}
}

Expr VisitExpr_(const CallNode* call_node) final {
auto call = ExprMutator::VisitExpr_(call_node);
if (auto matches_opt = ExtractMatchedExpr(pattern_, call, bindings_)) {
auto rewriten_expr = rewriter_func_(call, matches_opt.value());
memo_[call_node] = rewriten_expr;
return rewriten_expr;
}
return call;
}

private:
DFPattern pattern_;
PackedFunc rewriter_func_;
Map<Var, Expr> bindings_;
std::unordered_map<const Object*, Expr> memo_;
};

TVM_REGISTER_GLOBAL("relax.dpl.rewrite")
.set_body_typed([](DFPattern pat, PackedFunc rewriter, Function f) {
return PatternRewriter::Run(pat, rewriter, f);
});

} // namespace relax
} // namespace tvm
118 changes: 118 additions & 0 deletions tests/python/relax/test_dataflow_pattern.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -888,5 +888,123 @@ def simple_chain(x: R.Tensor((32, 32), "float32")) -> R.Tensor:
assert not ctx1.match_dfb(simple_chain.body.blocks[0])


def test_rewrite_simple():
@R.function
def main(x: R.Tensor((16, 16), "float32")) -> R.Tensor((16, 16), "float32"):
with R.dataflow():
x2 = R.add(x, x)
x4 = R.add(x2, x2)
R.output(x4)
return x4

@R.function
def expected1(x: R.Tensor((16, 16), dtype="float32")) -> R.Tensor((16, 16), dtype="float32"):
with R.dataflow():
lv: R.Tensor((16, 16), dtype="float32") = R.multiply(x, R.const(2, "float32"))
x4: R.Tensor((16, 16), dtype="float32") = R.multiply(lv, R.const(2, "float32"))
R.output(x4)
return x4

@R.function
def expected2(x: R.Tensor((16, 16), dtype="float32")) -> R.Tensor((16, 16), dtype="float32"):
with R.dataflow():
x4: R.Tensor((16, 16), dtype="float32") = R.multiply(x, R.const(4, "float32"))
R.output(x4)
return x4

x = wildcard()
pattern = is_op("relax.add")(x, x)

def rewriter(_, matchings):
return R.multiply(matchings[x], R.const(2, "float32"))

rewritten = rewrite(pattern, rewriter, main)
tvm.ir.assert_structural_equal(rewritten, expected1)

add1 = is_op("relax.add")(x, x)
pattern = is_op("relax.add")(add1, add1)

def rewriter(_, matchings):
return R.multiply(matchings[x], R.const(4, "float32"))

rewritten = rewrite(pattern, rewriter, main)
tvm.ir.assert_structural_equal(rewritten, expected2)

# No rewriting, return the original call node as is
def rewriter(orig, _):
return orig

rewritten = rewrite(pattern, rewriter, main)
tvm.ir.assert_structural_equal(rewritten, main)


def test_rewrite_attention():
@R.function
def main(
Q: R.Tensor((2, 4096, 8, 40), "float32"),
K: R.Tensor((2, 4096, 8, 40), "float32"),
V: R.Tensor((2, 4096, 8, 40), "float32"),
) -> R.Tensor((2, 4096, 8, 40), "float32"):
with R.dataflow():
lv58 = R.permute_dims(Q, axes=[0, 2, 1, 3])
lv59 = R.reshape(lv58, R.shape([16, 4096, 40]))

lv61 = R.permute_dims(K, axes=[0, 2, 1, 3])
lv62 = R.reshape(lv61, R.shape([16, 4096, 40]))

lv64 = R.permute_dims(V, axes=[0, 2, 1, 3])
lv65 = R.reshape(lv64, R.shape([16, 4096, 40]))

lv62_transposed = R.permute_dims(lv62, axes=[0, 2, 1])
lv3_1 = R.matmul(lv59, lv62_transposed)
lv68 = R.multiply(lv3_1, R.const(0.15811388194561005, "float32"))
lv69 = R.nn.softmax(lv68, axis=-1)
lv_3 = R.matmul(lv69, lv65)

lv71 = R.reshape(lv_3, R.shape([2, 8, 4096, 40]))
lv72 = R.permute_dims(lv71, axes=[0, 2, 1, 3])
R.output(lv72)

return lv72

@R.function
def expected(
Q: R.Tensor((2, 4096, 8, 40), dtype="float32"),
K: R.Tensor((2, 4096, 8, 40), dtype="float32"),
V: R.Tensor((2, 4096, 8, 40), dtype="float32"),
) -> R.Tensor((2, 4096, 8, 40), dtype="float32"):
with R.dataflow():
lv72: R.Tensor((2, 4096, 8, 40), dtype="float32") = R.nn.attention(Q, V, K)
R.output(lv72)
return lv72

def BSNH_to_BSH(tensor):
return is_op("relax.reshape")(is_op("relax.permute_dims")(tensor), wildcard())

def BSH_to_BSNH(tensor):
return is_op("relax.permute_dims")(is_op("relax.reshape")(tensor, wildcard()))

Q = wildcard()
K = wildcard()
V = wildcard()

Q_3D = BSNH_to_BSH(Q)
V_3D = BSNH_to_BSH(V)
K_3D = BSNH_to_BSH(K)

matmul1 = is_op("relax.matmul")(Q_3D, is_op("relax.permute_dims")(V_3D))
multiply = is_op("relax.multiply")(matmul1, is_const())
softmax = is_op("relax.nn.softmax")(multiply)
matmul2 = is_op("relax.matmul")(softmax, K_3D)

pattern = BSH_to_BSNH(matmul2)

def rewriter(_, matchings):
return R.nn.attention(matchings[Q], matchings[K], matchings[V])
Comment thread
masahi marked this conversation as resolved.

rewritten = rewrite(pattern, rewriter, main)
tvm.ir.assert_structural_equal(rewritten, expected)


if __name__ == "__main__":
tvm.testing.main()
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' [Unity] Support pattern-based rewriting by masahi · Pull Request #14312 · apache/tvm · GitHub
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
40 changes: 38 additions & 2 deletions python/tvm/relax/dpl/pattern.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@
# pylint: disable=pointless-statement

import typing
from typing import Dict, List, Optional, Tuple, Union
from typing import Dict, List, Optional, Tuple, Union, Callable

import tvm
import tvm._ffi as tvm_ffi
Expand All@@ -31,7 +31,7 @@
from ...ir import make_node
from ...ir.base import Node
from ...runtime import Object
from ..expr import Expr, Var
from ..expr import Expr, Var, Function
from . import _ffi as ffi


Expand DownExpand Up@@ -1115,3 +1115,39 @@ def make_fused_bias_activation_pattern(op_name, with_bias=False, activation=None
return is_op(activation)(out)

return out


def rewrite(
pattern: DFPattern, rewriter: Callable[[Expr, Dict[DFPattern, Expr]], Expr], func: Function
) -> Function:
"""
Rewrite a function with the given pattern and the rewriter function.

Parameters
----------
pattern: DFPattern
The pattern to match.

rewriter: Callable[[Expr, Dict[DFPattern, Expr]], Expr]
The function to be called on a successful matching for rewriting. Given the matched
call node and the map of patterns and matched expressions, it should return a new call node
to replace the original one or the original matched call node as is.

For example, to replace x + x with 2 * x, we can write the rewriter as follows:
```
x = wildcard()
pattern = is_op("relax.add")(x, x)

def rewriter(orig, matchings):
return R.multiply(matchings[x], R.const(2, "float32"))
```

func: Function
The function to rewrite.

Returns
-------
rewritten_func: Function
The rewritten or the input function, depending on the pattern matching result.
"""
return ffi.rewrite(pattern, rewriter, func)
48 changes: 48 additions & 0 deletions src/relax/ir/dataflow_matcher.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -766,5 +766,53 @@ Map<DFPattern, Var> MatchGraph(const PatternContext& ctx, const DataflowBlock& d

TVM_REGISTER_GLOBAL("relax.dpl.match_dfb").set_body_typed(MatchGraph);

/*!
* \brief Apply pattern matching to each call node and replace matching ones with the output of
* a user-provided rewriter function.
*/
class PatternRewriter : ExprMutator {
public:
using ExprMutator::VisitExpr_;

PatternRewriter(DFPattern pat, PackedFunc rewriter_func)
: pattern_(pat), rewriter_func_(rewriter_func) {}

static Expr Run(DFPattern pat, PackedFunc rewriter_func, Function f) {
PatternRewriter rewriter(pat, rewriter_func);
return RemoveAllUnused(Downcast<Function>(rewriter.VisitExpr(f)));
}

void VisitBinding_(const VarBindingNode* binding) final {
bindings_.Set(binding->var, binding->value);
ExprMutator::VisitBinding_(binding);
if (auto it = memo_.find(binding->value.get()); it != memo_.end()) {
// We need to update the binding to pass to ExtractMatchedExpr, so that the rewritten
// expression can be subject to further pattern matchings.
bindings_.Set(binding->var, it->second);
}
}

Expr VisitExpr_(const CallNode* call_node) final {
auto call = ExprMutator::VisitExpr_(call_node);
if (auto matches_opt = ExtractMatchedExpr(pattern_, call, bindings_)) {
auto rewriten_expr = rewriter_func_(call, matches_opt.value());
memo_[call_node] = rewriten_expr;
return rewriten_expr;
}
return call;
}

private:
DFPattern pattern_;
PackedFunc rewriter_func_;
Map<Var, Expr> bindings_;
std::unordered_map<const Object*, Expr> memo_;
};

TVM_REGISTER_GLOBAL("relax.dpl.rewrite")
.set_body_typed([](DFPattern pat, PackedFunc rewriter, Function f) {
return PatternRewriter::Run(pat, rewriter, f);
});

} // namespace relax
} // namespace tvm
118 changes: 118 additions & 0 deletions tests/python/relax/test_dataflow_pattern.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -888,5 +888,123 @@ def simple_chain(x: R.Tensor((32, 32), "float32")) -> R.Tensor:
assert not ctx1.match_dfb(simple_chain.body.blocks[0])


def test_rewrite_simple():
@R.function
def main(x: R.Tensor((16, 16), "float32")) -> R.Tensor((16, 16), "float32"):
with R.dataflow():
x2 = R.add(x, x)
x4 = R.add(x2, x2)
R.output(x4)
return x4

@R.function
def expected1(x: R.Tensor((16, 16), dtype="float32")) -> R.Tensor((16, 16), dtype="float32"):
with R.dataflow():
lv: R.Tensor((16, 16), dtype="float32") = R.multiply(x, R.const(2, "float32"))
x4: R.Tensor((16, 16), dtype="float32") = R.multiply(lv, R.const(2, "float32"))
R.output(x4)
return x4

@R.function
def expected2(x: R.Tensor((16, 16), dtype="float32")) -> R.Tensor((16, 16), dtype="float32"):
with R.dataflow():
x4: R.Tensor((16, 16), dtype="float32") = R.multiply(x, R.const(4, "float32"))
R.output(x4)
return x4

x = wildcard()
pattern = is_op("relax.add")(x, x)

def rewriter(_, matchings):
return R.multiply(matchings[x], R.const(2, "float32"))

rewritten = rewrite(pattern, rewriter, main)
tvm.ir.assert_structural_equal(rewritten, expected1)

add1 = is_op("relax.add")(x, x)
pattern = is_op("relax.add")(add1, add1)

def rewriter(_, matchings):
return R.multiply(matchings[x], R.const(4, "float32"))

rewritten = rewrite(pattern, rewriter, main)
tvm.ir.assert_structural_equal(rewritten, expected2)

# No rewriting, return the original call node as is
def rewriter(orig, _):
return orig

rewritten = rewrite(pattern, rewriter, main)
tvm.ir.assert_structural_equal(rewritten, main)


def test_rewrite_attention():
@R.function
def main(
Q: R.Tensor((2, 4096, 8, 40), "float32"),
K: R.Tensor((2, 4096, 8, 40), "float32"),
V: R.Tensor((2, 4096, 8, 40), "float32"),
) -> R.Tensor((2, 4096, 8, 40), "float32"):
with R.dataflow():
lv58 = R.permute_dims(Q, axes=[0, 2, 1, 3])
lv59 = R.reshape(lv58, R.shape([16, 4096, 40]))

lv61 = R.permute_dims(K, axes=[0, 2, 1, 3])
lv62 = R.reshape(lv61, R.shape([16, 4096, 40]))

lv64 = R.permute_dims(V, axes=[0, 2, 1, 3])
lv65 = R.reshape(lv64, R.shape([16, 4096, 40]))

lv62_transposed = R.permute_dims(lv62, axes=[0, 2, 1])
lv3_1 = R.matmul(lv59, lv62_transposed)
lv68 = R.multiply(lv3_1, R.const(0.15811388194561005, "float32"))
lv69 = R.nn.softmax(lv68, axis=-1)
lv_3 = R.matmul(lv69, lv65)

lv71 = R.reshape(lv_3, R.shape([2, 8, 4096, 40]))
lv72 = R.permute_dims(lv71, axes=[0, 2, 1, 3])
R.output(lv72)

return lv72

@R.function
def expected(
Q: R.Tensor((2, 4096, 8, 40), dtype="float32"),
K: R.Tensor((2, 4096, 8, 40), dtype="float32"),
V: R.Tensor((2, 4096, 8, 40), dtype="float32"),
) -> R.Tensor((2, 4096, 8, 40), dtype="float32"):
with R.dataflow():
lv72: R.Tensor((2, 4096, 8, 40), dtype="float32") = R.nn.attention(Q, V, K)
R.output(lv72)
return lv72

def BSNH_to_BSH(tensor):
return is_op("relax.reshape")(is_op("relax.permute_dims")(tensor), wildcard())

def BSH_to_BSNH(tensor):
return is_op("relax.permute_dims")(is_op("relax.reshape")(tensor, wildcard()))

Q = wildcard()
K = wildcard()
V = wildcard()

Q_3D = BSNH_to_BSH(Q)
V_3D = BSNH_to_BSH(V)
K_3D = BSNH_to_BSH(K)

matmul1 = is_op("relax.matmul")(Q_3D, is_op("relax.permute_dims")(V_3D))
multiply = is_op("relax.multiply")(matmul1, is_const())
softmax = is_op("relax.nn.softmax")(multiply)
matmul2 = is_op("relax.matmul")(softmax, K_3D)

pattern = BSH_to_BSNH(matmul2)

def rewriter(_, matchings):
return R.nn.attention(matchings[Q], matchings[K], matchings[V])
Comment thread
masahi marked this conversation as resolved.

rewritten = rewrite(pattern, rewriter, main)
tvm.ir.assert_structural_equal(rewritten, expected)


if __name__ == "__main__":
tvm.testing.main()
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' [Unity] Support pattern-based rewriting by masahi · Pull Request #14312 · apache/tvm · GitHub
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
40 changes: 38 additions & 2 deletions python/tvm/relax/dpl/pattern.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@
# pylint: disable=pointless-statement

import typing
from typing import Dict, List, Optional, Tuple, Union
from typing import Dict, List, Optional, Tuple, Union, Callable

import tvm
import tvm._ffi as tvm_ffi
Expand All@@ -31,7 +31,7 @@
from ...ir import make_node
from ...ir.base import Node
from ...runtime import Object
from ..expr import Expr, Var
from ..expr import Expr, Var, Function
from . import _ffi as ffi


Expand DownExpand Up@@ -1115,3 +1115,39 @@ def make_fused_bias_activation_pattern(op_name, with_bias=False, activation=None
return is_op(activation)(out)

return out


def rewrite(
pattern: DFPattern, rewriter: Callable[[Expr, Dict[DFPattern, Expr]], Expr], func: Function
) -> Function:
"""
Rewrite a function with the given pattern and the rewriter function.

Parameters
----------
pattern: DFPattern
The pattern to match.

rewriter: Callable[[Expr, Dict[DFPattern, Expr]], Expr]
The function to be called on a successful matching for rewriting. Given the matched
call node and the map of patterns and matched expressions, it should return a new call node
to replace the original one or the original matched call node as is.

For example, to replace x + x with 2 * x, we can write the rewriter as follows:
```
x = wildcard()
pattern = is_op("relax.add")(x, x)

def rewriter(orig, matchings):
return R.multiply(matchings[x], R.const(2, "float32"))
```

func: Function
The function to rewrite.

Returns
-------
rewritten_func: Function
The rewritten or the input function, depending on the pattern matching result.
"""
return ffi.rewrite(pattern, rewriter, func)
48 changes: 48 additions & 0 deletions src/relax/ir/dataflow_matcher.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -766,5 +766,53 @@ Map<DFPattern, Var> MatchGraph(const PatternContext& ctx, const DataflowBlock& d

TVM_REGISTER_GLOBAL("relax.dpl.match_dfb").set_body_typed(MatchGraph);

/*!
* \brief Apply pattern matching to each call node and replace matching ones with the output of
* a user-provided rewriter function.
*/
class PatternRewriter : ExprMutator {
public:
using ExprMutator::VisitExpr_;

PatternRewriter(DFPattern pat, PackedFunc rewriter_func)
: pattern_(pat), rewriter_func_(rewriter_func) {}

static Expr Run(DFPattern pat, PackedFunc rewriter_func, Function f) {
PatternRewriter rewriter(pat, rewriter_func);
return RemoveAllUnused(Downcast<Function>(rewriter.VisitExpr(f)));
}

void VisitBinding_(const VarBindingNode* binding) final {
bindings_.Set(binding->var, binding->value);
ExprMutator::VisitBinding_(binding);
if (auto it = memo_.find(binding->value.get()); it != memo_.end()) {
// We need to update the binding to pass to ExtractMatchedExpr, so that the rewritten
// expression can be subject to further pattern matchings.
bindings_.Set(binding->var, it->second);
}
}

Expr VisitExpr_(const CallNode* call_node) final {
auto call = ExprMutator::VisitExpr_(call_node);
if (auto matches_opt = ExtractMatchedExpr(pattern_, call, bindings_)) {
auto rewriten_expr = rewriter_func_(call, matches_opt.value());
memo_[call_node] = rewriten_expr;
return rewriten_expr;
}
return call;
}

private:
DFPattern pattern_;
PackedFunc rewriter_func_;
Map<Var, Expr> bindings_;
std::unordered_map<const Object*, Expr> memo_;
};

TVM_REGISTER_GLOBAL("relax.dpl.rewrite")
.set_body_typed([](DFPattern pat, PackedFunc rewriter, Function f) {
return PatternRewriter::Run(pat, rewriter, f);
});

} // namespace relax
} // namespace tvm
118 changes: 118 additions & 0 deletions tests/python/relax/test_dataflow_pattern.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -888,5 +888,123 @@ def simple_chain(x: R.Tensor((32, 32), "float32")) -> R.Tensor:
assert not ctx1.match_dfb(simple_chain.body.blocks[0])


def test_rewrite_simple():
@R.function
def main(x: R.Tensor((16, 16), "float32")) -> R.Tensor((16, 16), "float32"):
with R.dataflow():
x2 = R.add(x, x)
x4 = R.add(x2, x2)
R.output(x4)
return x4

@R.function
def expected1(x: R.Tensor((16, 16), dtype="float32")) -> R.Tensor((16, 16), dtype="float32"):
with R.dataflow():
lv: R.Tensor((16, 16), dtype="float32") = R.multiply(x, R.const(2, "float32"))
x4: R.Tensor((16, 16), dtype="float32") = R.multiply(lv, R.const(2, "float32"))
R.output(x4)
return x4

@R.function
def expected2(x: R.Tensor((16, 16), dtype="float32")) -> R.Tensor((16, 16), dtype="float32"):
with R.dataflow():
x4: R.Tensor((16, 16), dtype="float32") = R.multiply(x, R.const(4, "float32"))
R.output(x4)
return x4

x = wildcard()
pattern = is_op("relax.add")(x, x)

def rewriter(_, matchings):
return R.multiply(matchings[x], R.const(2, "float32"))

rewritten = rewrite(pattern, rewriter, main)
tvm.ir.assert_structural_equal(rewritten, expected1)

add1 = is_op("relax.add")(x, x)
pattern = is_op("relax.add")(add1, add1)

def rewriter(_, matchings):
return R.multiply(matchings[x], R.const(4, "float32"))

rewritten = rewrite(pattern, rewriter, main)
tvm.ir.assert_structural_equal(rewritten, expected2)

# No rewriting, return the original call node as is
def rewriter(orig, _):
return orig

rewritten = rewrite(pattern, rewriter, main)
tvm.ir.assert_structural_equal(rewritten, main)


def test_rewrite_attention():
@R.function
def main(
Q: R.Tensor((2, 4096, 8, 40), "float32"),
K: R.Tensor((2, 4096, 8, 40), "float32"),
V: R.Tensor((2, 4096, 8, 40), "float32"),
) -> R.Tensor((2, 4096, 8, 40), "float32"):
with R.dataflow():
lv58 = R.permute_dims(Q, axes=[0, 2, 1, 3])
lv59 = R.reshape(lv58, R.shape([16, 4096, 40]))

lv61 = R.permute_dims(K, axes=[0, 2, 1, 3])
lv62 = R.reshape(lv61, R.shape([16, 4096, 40]))

lv64 = R.permute_dims(V, axes=[0, 2, 1, 3])
lv65 = R.reshape(lv64, R.shape([16, 4096, 40]))

lv62_transposed = R.permute_dims(lv62, axes=[0, 2, 1])
lv3_1 = R.matmul(lv59, lv62_transposed)
lv68 = R.multiply(lv3_1, R.const(0.15811388194561005, "float32"))
lv69 = R.nn.softmax(lv68, axis=-1)
lv_3 = R.matmul(lv69, lv65)

lv71 = R.reshape(lv_3, R.shape([2, 8, 4096, 40]))
lv72 = R.permute_dims(lv71, axes=[0, 2, 1, 3])
R.output(lv72)

return lv72

@R.function
def expected(
Q: R.Tensor((2, 4096, 8, 40), dtype="float32"),
K: R.Tensor((2, 4096, 8, 40), dtype="float32"),
V: R.Tensor((2, 4096, 8, 40), dtype="float32"),
) -> R.Tensor((2, 4096, 8, 40), dtype="float32"):
with R.dataflow():
lv72: R.Tensor((2, 4096, 8, 40), dtype="float32") = R.nn.attention(Q, V, K)
R.output(lv72)
return lv72

def BSNH_to_BSH(tensor):
return is_op("relax.reshape")(is_op("relax.permute_dims")(tensor), wildcard())

def BSH_to_BSNH(tensor):
return is_op("relax.permute_dims")(is_op("relax.reshape")(tensor, wildcard()))

Q = wildcard()
K = wildcard()
V = wildcard()

Q_3D = BSNH_to_BSH(Q)
V_3D = BSNH_to_BSH(V)
K_3D = BSNH_to_BSH(K)

matmul1 = is_op("relax.matmul")(Q_3D, is_op("relax.permute_dims")(V_3D))
multiply = is_op("relax.multiply")(matmul1, is_const())
softmax = is_op("relax.nn.softmax")(multiply)
matmul2 = is_op("relax.matmul")(softmax, K_3D)

pattern = BSH_to_BSNH(matmul2)

def rewriter(_, matchings):
return R.nn.attention(matchings[Q], matchings[K], matchings[V])
Comment thread
masahi marked this conversation as resolved.

rewritten = rewrite(pattern, rewriter, main)
tvm.ir.assert_structural_equal(rewritten, expected)


if __name__ == "__main__":
tvm.testing.main()
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' [Unity] Support pattern-based rewriting by masahi · Pull Request #14312 · apache/tvm · GitHub
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
40 changes: 38 additions & 2 deletions python/tvm/relax/dpl/pattern.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@
# pylint: disable=pointless-statement

import typing
from typing import Dict, List, Optional, Tuple, Union
from typing import Dict, List, Optional, Tuple, Union, Callable

import tvm
import tvm._ffi as tvm_ffi
Expand All@@ -31,7 +31,7 @@
from ...ir import make_node
from ...ir.base import Node
from ...runtime import Object
from ..expr import Expr, Var
from ..expr import Expr, Var, Function
from . import _ffi as ffi


Expand DownExpand Up@@ -1115,3 +1115,39 @@ def make_fused_bias_activation_pattern(op_name, with_bias=False, activation=None
return is_op(activation)(out)

return out


def rewrite(
pattern: DFPattern, rewriter: Callable[[Expr, Dict[DFPattern, Expr]], Expr], func: Function
) -> Function:
"""
Rewrite a function with the given pattern and the rewriter function.

Parameters
----------
pattern: DFPattern
The pattern to match.

rewriter: Callable[[Expr, Dict[DFPattern, Expr]], Expr]
The function to be called on a successful matching for rewriting. Given the matched
call node and the map of patterns and matched expressions, it should return a new call node
to replace the original one or the original matched call node as is.

For example, to replace x + x with 2 * x, we can write the rewriter as follows:
```
x = wildcard()
pattern = is_op("relax.add")(x, x)

def rewriter(orig, matchings):
return R.multiply(matchings[x], R.const(2, "float32"))
```

func: Function
The function to rewrite.

Returns
-------
rewritten_func: Function
The rewritten or the input function, depending on the pattern matching result.
"""
return ffi.rewrite(pattern, rewriter, func)
48 changes: 48 additions & 0 deletions src/relax/ir/dataflow_matcher.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -766,5 +766,53 @@ Map<DFPattern, Var> MatchGraph(const PatternContext& ctx, const DataflowBlock& d

TVM_REGISTER_GLOBAL("relax.dpl.match_dfb").set_body_typed(MatchGraph);

/*!
* \brief Apply pattern matching to each call node and replace matching ones with the output of
* a user-provided rewriter function.
*/
class PatternRewriter : ExprMutator {
public:
using ExprMutator::VisitExpr_;

PatternRewriter(DFPattern pat, PackedFunc rewriter_func)
: pattern_(pat), rewriter_func_(rewriter_func) {}

static Expr Run(DFPattern pat, PackedFunc rewriter_func, Function f) {
PatternRewriter rewriter(pat, rewriter_func);
return RemoveAllUnused(Downcast<Function>(rewriter.VisitExpr(f)));
}

void VisitBinding_(const VarBindingNode* binding) final {
bindings_.Set(binding->var, binding->value);
ExprMutator::VisitBinding_(binding);
if (auto it = memo_.find(binding->value.get()); it != memo_.end()) {
// We need to update the binding to pass to ExtractMatchedExpr, so that the rewritten
// expression can be subject to further pattern matchings.
bindings_.Set(binding->var, it->second);
}
}

Expr VisitExpr_(const CallNode* call_node) final {
auto call = ExprMutator::VisitExpr_(call_node);
if (auto matches_opt = ExtractMatchedExpr(pattern_, call, bindings_)) {
auto rewriten_expr = rewriter_func_(call, matches_opt.value());
memo_[call_node] = rewriten_expr;
return rewriten_expr;
}
return call;
}

private:
DFPattern pattern_;
PackedFunc rewriter_func_;
Map<Var, Expr> bindings_;
std::unordered_map<const Object*, Expr> memo_;
};

TVM_REGISTER_GLOBAL("relax.dpl.rewrite")
.set_body_typed([](DFPattern pat, PackedFunc rewriter, Function f) {
return PatternRewriter::Run(pat, rewriter, f);
});

} // namespace relax
} // namespace tvm
118 changes: 118 additions & 0 deletions tests/python/relax/test_dataflow_pattern.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -888,5 +888,123 @@ def simple_chain(x: R.Tensor((32, 32), "float32")) -> R.Tensor:
assert not ctx1.match_dfb(simple_chain.body.blocks[0])


def test_rewrite_simple():
@R.function
def main(x: R.Tensor((16, 16), "float32")) -> R.Tensor((16, 16), "float32"):
with R.dataflow():
x2 = R.add(x, x)
x4 = R.add(x2, x2)
R.output(x4)
return x4

@R.function
def expected1(x: R.Tensor((16, 16), dtype="float32")) -> R.Tensor((16, 16), dtype="float32"):
with R.dataflow():
lv: R.Tensor((16, 16), dtype="float32") = R.multiply(x, R.const(2, "float32"))
x4: R.Tensor((16, 16), dtype="float32") = R.multiply(lv, R.const(2, "float32"))
R.output(x4)
return x4

@R.function
def expected2(x: R.Tensor((16, 16), dtype="float32")) -> R.Tensor((16, 16), dtype="float32"):
with R.dataflow():
x4: R.Tensor((16, 16), dtype="float32") = R.multiply(x, R.const(4, "float32"))
R.output(x4)
return x4

x = wildcard()
pattern = is_op("relax.add")(x, x)

def rewriter(_, matchings):
return R.multiply(matchings[x], R.const(2, "float32"))

rewritten = rewrite(pattern, rewriter, main)
tvm.ir.assert_structural_equal(rewritten, expected1)

add1 = is_op("relax.add")(x, x)
pattern = is_op("relax.add")(add1, add1)

def rewriter(_, matchings):
return R.multiply(matchings[x], R.const(4, "float32"))

rewritten = rewrite(pattern, rewriter, main)
tvm.ir.assert_structural_equal(rewritten, expected2)

# No rewriting, return the original call node as is
def rewriter(orig, _):
return orig

rewritten = rewrite(pattern, rewriter, main)
tvm.ir.assert_structural_equal(rewritten, main)


def test_rewrite_attention():
@R.function
def main(
Q: R.Tensor((2, 4096, 8, 40), "float32"),
K: R.Tensor((2, 4096, 8, 40), "float32"),
V: R.Tensor((2, 4096, 8, 40), "float32"),
) -> R.Tensor((2, 4096, 8, 40), "float32"):
with R.dataflow():
lv58 = R.permute_dims(Q, axes=[0, 2, 1, 3])
lv59 = R.reshape(lv58, R.shape([16, 4096, 40]))

lv61 = R.permute_dims(K, axes=[0, 2, 1, 3])
lv62 = R.reshape(lv61, R.shape([16, 4096, 40]))

lv64 = R.permute_dims(V, axes=[0, 2, 1, 3])
lv65 = R.reshape(lv64, R.shape([16, 4096, 40]))

lv62_transposed = R.permute_dims(lv62, axes=[0, 2, 1])
lv3_1 = R.matmul(lv59, lv62_transposed)
lv68 = R.multiply(lv3_1, R.const(0.15811388194561005, "float32"))
lv69 = R.nn.softmax(lv68, axis=-1)
lv_3 = R.matmul(lv69, lv65)

lv71 = R.reshape(lv_3, R.shape([2, 8, 4096, 40]))
lv72 = R.permute_dims(lv71, axes=[0, 2, 1, 3])
R.output(lv72)

return lv72

@R.function
def expected(
Q: R.Tensor((2, 4096, 8, 40), dtype="float32"),
K: R.Tensor((2, 4096, 8, 40), dtype="float32"),
V: R.Tensor((2, 4096, 8, 40), dtype="float32"),
) -> R.Tensor((2, 4096, 8, 40), dtype="float32"):
with R.dataflow():
lv72: R.Tensor((2, 4096, 8, 40), dtype="float32") = R.nn.attention(Q, V, K)
R.output(lv72)
return lv72

def BSNH_to_BSH(tensor):
return is_op("relax.reshape")(is_op("relax.permute_dims")(tensor), wildcard())

def BSH_to_BSNH(tensor):
return is_op("relax.permute_dims")(is_op("relax.reshape")(tensor, wildcard()))

Q = wildcard()
K = wildcard()
V = wildcard()

Q_3D = BSNH_to_BSH(Q)
V_3D = BSNH_to_BSH(V)
K_3D = BSNH_to_BSH(K)

matmul1 = is_op("relax.matmul")(Q_3D, is_op("relax.permute_dims")(V_3D))
multiply = is_op("relax.multiply")(matmul1, is_const())
softmax = is_op("relax.nn.softmax")(multiply)
matmul2 = is_op("relax.matmul")(softmax, K_3D)

pattern = BSH_to_BSNH(matmul2)

def rewriter(_, matchings):
return R.nn.attention(matchings[Q], matchings[K], matchings[V])
Comment thread
masahi marked this conversation as resolved.

rewritten = rewrite(pattern, rewriter, main)
tvm.ir.assert_structural_equal(rewritten, expected)


if __name__ == "__main__":
tvm.testing.main()
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); [Unity] Support pattern-based rewriting by masahi · Pull Request #14312 · apache/tvm · GitHub
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
40 changes: 38 additions & 2 deletions python/tvm/relax/dpl/pattern.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,7 +20,7 @@
# pylint: disable=pointless-statement

import typing
from typing import Dict, List, Optional, Tuple, Union
from typing import Dict, List, Optional, Tuple, Union, Callable

import tvm
import tvm._ffi as tvm_ffi
Expand All@@ -31,7 +31,7 @@
from ...ir import make_node
from ...ir.base import Node
from ...runtime import Object
from ..expr import Expr, Var
from ..expr import Expr, Var, Function
from . import _ffi as ffi


Expand DownExpand Up@@ -1115,3 +1115,39 @@ def make_fused_bias_activation_pattern(op_name, with_bias=False, activation=None
return is_op(activation)(out)

return out


def rewrite(
pattern: DFPattern, rewriter: Callable[[Expr, Dict[DFPattern, Expr]], Expr], func: Function
) -> Function:
"""
Rewrite a function with the given pattern and the rewriter function.

Parameters
----------
pattern: DFPattern
The pattern to match.

rewriter: Callable[[Expr, Dict[DFPattern, Expr]], Expr]
The function to be called on a successful matching for rewriting. Given the matched
call node and the map of patterns and matched expressions, it should return a new call node
to replace the original one or the original matched call node as is.

For example, to replace x + x with 2 * x, we can write the rewriter as follows:
```
x = wildcard()
pattern = is_op("relax.add")(x, x)

def rewriter(orig, matchings):
return R.multiply(matchings[x], R.const(2, "float32"))
```

func: Function
The function to rewrite.

Returns
-------
rewritten_func: Function
The rewritten or the input function, depending on the pattern matching result.
"""
return ffi.rewrite(pattern, rewriter, func)
48 changes: 48 additions & 0 deletions src/relax/ir/dataflow_matcher.cc
Original file line numberDiff line numberDiff line change
Expand Up@@ -766,5 +766,53 @@ Map<DFPattern, Var> MatchGraph(const PatternContext& ctx, const DataflowBlock& d

TVM_REGISTER_GLOBAL("relax.dpl.match_dfb").set_body_typed(MatchGraph);

/*!
* \brief Apply pattern matching to each call node and replace matching ones with the output of
* a user-provided rewriter function.
*/
class PatternRewriter : ExprMutator {
public:
using ExprMutator::VisitExpr_;

PatternRewriter(DFPattern pat, PackedFunc rewriter_func)
: pattern_(pat), rewriter_func_(rewriter_func) {}

static Expr Run(DFPattern pat, PackedFunc rewriter_func, Function f) {
PatternRewriter rewriter(pat, rewriter_func);
return RemoveAllUnused(Downcast<Function>(rewriter.VisitExpr(f)));
}

void VisitBinding_(const VarBindingNode* binding) final {
bindings_.Set(binding->var, binding->value);
ExprMutator::VisitBinding_(binding);
if (auto it = memo_.find(binding->value.get()); it != memo_.end()) {
// We need to update the binding to pass to ExtractMatchedExpr, so that the rewritten
// expression can be subject to further pattern matchings.
bindings_.Set(binding->var, it->second);
}
}

Expr VisitExpr_(const CallNode* call_node) final {
auto call = ExprMutator::VisitExpr_(call_node);
if (auto matches_opt = ExtractMatchedExpr(pattern_, call, bindings_)) {
auto rewriten_expr = rewriter_func_(call, matches_opt.value());
memo_[call_node] = rewriten_expr;
return rewriten_expr;
}
return call;
}

private:
DFPattern pattern_;
PackedFunc rewriter_func_;
Map<Var, Expr> bindings_;
std::unordered_map<const Object*, Expr> memo_;
};

TVM_REGISTER_GLOBAL("relax.dpl.rewrite")
.set_body_typed([](DFPattern pat, PackedFunc rewriter, Function f) {
return PatternRewriter::Run(pat, rewriter, f);
});

} // namespace relax
} // namespace tvm
118 changes: 118 additions & 0 deletions tests/python/relax/test_dataflow_pattern.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -888,5 +888,123 @@ def simple_chain(x: R.Tensor((32, 32), "float32")) -> R.Tensor:
assert not ctx1.match_dfb(simple_chain.body.blocks[0])


def test_rewrite_simple():
@R.function
def main(x: R.Tensor((16, 16), "float32")) -> R.Tensor((16, 16), "float32"):
with R.dataflow():
x2 = R.add(x, x)
x4 = R.add(x2, x2)
R.output(x4)
return x4

@R.function
def expected1(x: R.Tensor((16, 16), dtype="float32")) -> R.Tensor((16, 16), dtype="float32"):
with R.dataflow():
lv: R.Tensor((16, 16), dtype="float32") = R.multiply(x, R.const(2, "float32"))
x4: R.Tensor((16, 16), dtype="float32") = R.multiply(lv, R.const(2, "float32"))
R.output(x4)
return x4

@R.function
def expected2(x: R.Tensor((16, 16), dtype="float32")) -> R.Tensor((16, 16), dtype="float32"):
with R.dataflow():
x4: R.Tensor((16, 16), dtype="float32") = R.multiply(x, R.const(4, "float32"))
R.output(x4)
return x4

x = wildcard()
pattern = is_op("relax.add")(x, x)

def rewriter(_, matchings):
return R.multiply(matchings[x], R.const(2, "float32"))

rewritten = rewrite(pattern, rewriter, main)
tvm.ir.assert_structural_equal(rewritten, expected1)

add1 = is_op("relax.add")(x, x)
pattern = is_op("relax.add")(add1, add1)

def rewriter(_, matchings):
return R.multiply(matchings[x], R.const(4, "float32"))

rewritten = rewrite(pattern, rewriter, main)
tvm.ir.assert_structural_equal(rewritten, expected2)

# No rewriting, return the original call node as is
def rewriter(orig, _):
return orig

rewritten = rewrite(pattern, rewriter, main)
tvm.ir.assert_structural_equal(rewritten, main)


def test_rewrite_attention():
@R.function
def main(
Q: R.Tensor((2, 4096, 8, 40), "float32"),
K: R.Tensor((2, 4096, 8, 40), "float32"),
V: R.Tensor((2, 4096, 8, 40), "float32"),
) -> R.Tensor((2, 4096, 8, 40), "float32"):
with R.dataflow():
lv58 = R.permute_dims(Q, axes=[0, 2, 1, 3])
lv59 = R.reshape(lv58, R.shape([16, 4096, 40]))

lv61 = R.permute_dims(K, axes=[0, 2, 1, 3])
lv62 = R.reshape(lv61, R.shape([16, 4096, 40]))

lv64 = R.permute_dims(V, axes=[0, 2, 1, 3])
lv65 = R.reshape(lv64, R.shape([16, 4096, 40]))

lv62_transposed = R.permute_dims(lv62, axes=[0, 2, 1])
lv3_1 = R.matmul(lv59, lv62_transposed)
lv68 = R.multiply(lv3_1, R.const(0.15811388194561005, "float32"))
lv69 = R.nn.softmax(lv68, axis=-1)
lv_3 = R.matmul(lv69, lv65)

lv71 = R.reshape(lv_3, R.shape([2, 8, 4096, 40]))
lv72 = R.permute_dims(lv71, axes=[0, 2, 1, 3])
R.output(lv72)

return lv72

@R.function
def expected(
Q: R.Tensor((2, 4096, 8, 40), dtype="float32"),
K: R.Tensor((2, 4096, 8, 40), dtype="float32"),
V: R.Tensor((2, 4096, 8, 40), dtype="float32"),
) -> R.Tensor((2, 4096, 8, 40), dtype="float32"):
with R.dataflow():
lv72: R.Tensor((2, 4096, 8, 40), dtype="float32") = R.nn.attention(Q, V, K)
R.output(lv72)
return lv72

def BSNH_to_BSH(tensor):
return is_op("relax.reshape")(is_op("relax.permute_dims")(tensor), wildcard())

def BSH_to_BSNH(tensor):
return is_op("relax.permute_dims")(is_op("relax.reshape")(tensor, wildcard()))

Q = wildcard()
K = wildcard()
V = wildcard()

Q_3D = BSNH_to_BSH(Q)
V_3D = BSNH_to_BSH(V)
K_3D = BSNH_to_BSH(K)

matmul1 = is_op("relax.matmul")(Q_3D, is_op("relax.permute_dims")(V_3D))
multiply = is_op("relax.multiply")(matmul1, is_const())
softmax = is_op("relax.nn.softmax")(multiply)
matmul2 = is_op("relax.matmul")(softmax, K_3D)

pattern = BSH_to_BSNH(matmul2)

def rewriter(_, matchings):
return R.nn.attention(matchings[Q], matchings[K], matchings[V])
Comment thread
masahi marked this conversation as resolved.

rewritten = rewrite(pattern, rewriter, main)
tvm.ir.assert_structural_equal(rewritten, expected)


if __name__ == "__main__":
tvm.testing.main()