diff options
| author | Max Filippov | 2019-03-22 04:22:03 +0100 |
|---|---|---|
| committer | Max Filippov | 2019-03-22 05:47:50 +0100 |
| commit | b9ec52188f1eafb2901d37a57727bbf1d8bbe3ca (patch) | |
| tree | 9fc0259f9fa49c37ef235806cc953ccb8a534e3b | |
| parent | Update version for v4.0.0-rc0 release (diff) | |
| download | qemu-b9ec52188f1eafb2901d37a57727bbf1d8bbe3ca.tar.gz qemu-b9ec52188f1eafb2901d37a57727bbf1d8bbe3ca.tar.xz qemu-b9ec52188f1eafb2901d37a57727bbf1d8bbe3ca.zip | |
target/xtensa: fix break_dependency for repeated resources
break_dependency incorrectly handles the case of dependency on an opcode
that references the same register multiple times. E.g. the following
instruction is translated incorrectly:
{ or a2, a3, a3 ; or a3, a2, a2 }
This happens because resource indices of both dependency graph nodes are
incremented, and a copy for the second instance of the same register in
the ending node is not done.
Only increment resource index of the ending node of the dependency.
Add test.
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
| -rw-r--r-- | target/xtensa/translate.c | 1 | ||||
| -rw-r--r-- | tests/tcg/xtensa/test_flix.S | 17 |
2 files changed, 17 insertions, 1 deletions
diff --git a/target/xtensa/translate.c b/target/xtensa/translate.c index 77bc04d6b0..65561d2c49 100644 --- a/target/xtensa/translate.c +++ b/target/xtensa/translate.c @@ -1041,7 +1041,6 @@ static bool break_dependency(struct slot_prop *a, copy[n].resource = b->in[j].resource; copy[n].arg = b->arg + index; ++n; - ++i; ++j; rv = true; } diff --git a/tests/tcg/xtensa/test_flix.S b/tests/tcg/xtensa/test_flix.S index 7c259e7018..7af06b2b88 100644 --- a/tests/tcg/xtensa/test_flix.S +++ b/tests/tcg/xtensa/test_flix.S @@ -55,6 +55,23 @@ test sum .previous test_end +test rep_dependency + + { + movi a2, 1 + movi a3, 2 + nop + } + { + or a2, a3, a3 + or a3, a2, a2 + nop + } + assert eqi, a2, 2 + assert eqi, a3, 1 + +test_end + #endif test_suite_end |