package/gcc: xtensa: fix atomic NAND code generation
PATCH 1/1 package/gcc: xtensa: fix atomic NAND code generation
xtensa gcc incorrectly generates code for atomic NAND operation as ~a1 & a2 instead of ~(a1 & a2). Fix that.
Backported from: r264087
Signed-off-by Max Filippov <[email protected]>
--- ...nsa-fix-NAND-code-in-xtensa_expand_atomic.patch | 39 ++++++++++++++++++++++ ...nsa-fix-NAND-code-in-xtensa_expand_atomic.patch | 39 ++++++++++++++++++++++ ...nsa-fix-NAND-code-in-xtensa_expand_atomic.patch | 39 ++++++++++++++++++++++ 3 files changed, 117 insertions(+) create mode 100644 package/gcc/6.4.0/872-gcc-xtensa-fix-NAND-code-in-xtensa_expand_atomic.patch create mode 100644 package/gcc/7.3.0/0003-gcc-xtensa-fix-NAND-code-in-xtensa_expand_atomic.patch create mode 100644 package/gcc/8.2.0/0004-gcc-xtensa-fix-NAND-code-in-xtensa_expand_atomic.patch
package/gcc/6.4.0/872-gcc-xtensa-fix-NAND-code-in-xtensa_expand_atomic.patch new file +39 -0
@@ -0,0 +1,39 @@ +From 6765eecde2ed8d4be0fc217408b9e9b92a840aff Mon Sep 17 00:00:00 2001 +From: Max Filippov <[email protected]> +Date: Tue, 4 Sep 2018 00:39:32 -0700 +Subject: [PATCH] gcc: xtensa: fix NAND code in xtensa_expand_atomic + +NAND is ~(a1 & a2), but xtensa_expand_atomic does ~a1 & a2. +That fixes libatomic tests atomic-op-{1,2}. + +gcc/ +2018-09-04 Max Filippov <[email protected]> + + * config/xtensa/xtensa.c (xtensa_expand_atomic): Reorder AND and + XOR operations in NAND case. + +Signed-off-by: Max Filippov <[email protected]> +Backported from: r264087 +--- + gcc/config/xtensa/xtensa.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c +index 7cfe64d42895..080bb4ad765d 100644 +--- a/gcc/config/xtensa/xtensa.c ++++ b/gcc/config/xtensa/xtensa.c +@@ -1614,9 +1614,9 @@ xtensa_expand_atomic (enum rtx_code code, rtx target, rtx mem, rtx val, + break; + + case MULT: /* NAND */ +- tmp = expand_simple_binop (SImode, XOR, old, ac.modemask, ++ tmp = expand_simple_binop (SImode, AND, old, val, + NULL_RTX, 1, OPTAB_DIRECT); +- tmp = expand_simple_binop (SImode, AND, tmp, val, ++ tmp = expand_simple_binop (SImode, XOR, tmp, ac.modemask, + new_rtx, 1, OPTAB_DIRECT); + break; + +-- +2.11.0 +
package/gcc/7.3.0/0003-gcc-xtensa-fix-NAND-code-in-xtensa_expand_atomic.patch new file +39 -0
@@ -0,0 +1,39 @@ +From 6765eecde2ed8d4be0fc217408b9e9b92a840aff Mon Sep 17 00:00:00 2001 +From: Max Filippov <[email protected]> +Date: Tue, 4 Sep 2018 00:39:32 -0700 +Subject: [PATCH] gcc: xtensa: fix NAND code in xtensa_expand_atomic + +NAND is ~(a1 & a2), but xtensa_expand_atomic does ~a1 & a2. +That fixes libatomic tests atomic-op-{1,2}. + +gcc/ +2018-09-04 Max Filippov <[email protected]> + + * config/xtensa/xtensa.c (xtensa_expand_atomic): Reorder AND and + XOR operations in NAND case. + +Signed-off-by: Max Filippov <[email protected]> +Backported from: r264087 +--- + gcc/config/xtensa/xtensa.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c +index 7cfe64d42895..080bb4ad765d 100644 +--- a/gcc/config/xtensa/xtensa.c ++++ b/gcc/config/xtensa/xtensa.c +@@ -1614,9 +1614,9 @@ xtensa_expand_atomic (enum rtx_code code, rtx target, rtx mem, rtx val, + break; + + case MULT: /* NAND */ +- tmp = expand_simple_binop (SImode, XOR, old, ac.modemask, ++ tmp = expand_simple_binop (SImode, AND, old, val, + NULL_RTX, 1, OPTAB_DIRECT); +- tmp = expand_simple_binop (SImode, AND, tmp, val, ++ tmp = expand_simple_binop (SImode, XOR, tmp, ac.modemask, + new_rtx, 1, OPTAB_DIRECT); + break; + +-- +2.11.0 +
package/gcc/8.2.0/0004-gcc-xtensa-fix-NAND-code-in-xtensa_expand_atomic.patch new file +39 -0
@@ -0,0 +1,39 @@ +From 6765eecde2ed8d4be0fc217408b9e9b92a840aff Mon Sep 17 00:00:00 2001 +From: Max Filippov <[email protected]> +Date: Tue, 4 Sep 2018 00:39:32 -0700 +Subject: [PATCH] gcc: xtensa: fix NAND code in xtensa_expand_atomic + +NAND is ~(a1 & a2), but xtensa_expand_atomic does ~a1 & a2. +That fixes libatomic tests atomic-op-{1,2}. + +gcc/ +2018-09-04 Max Filippov <[email protected]> + + * config/xtensa/xtensa.c (xtensa_expand_atomic): Reorder AND and + XOR operations in NAND case. + +Signed-off-by: Max Filippov <[email protected]> +Backported from: r264087 +--- + gcc/config/xtensa/xtensa.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c +index 7cfe64d42895..080bb4ad765d 100644 +--- a/gcc/config/xtensa/xtensa.c ++++ b/gcc/config/xtensa/xtensa.c +@@ -1614,9 +1614,9 @@ xtensa_expand_atomic (enum rtx_code code, rtx target, rtx mem, rtx val, + break; + + case MULT: /* NAND */ +- tmp = expand_simple_binop (SImode, XOR, old, ac.modemask, ++ tmp = expand_simple_binop (SImode, AND, old, val, + NULL_RTX, 1, OPTAB_DIRECT); +- tmp = expand_simple_binop (SImode, AND, tmp, val, ++ tmp = expand_simple_binop (SImode, XOR, tmp, ac.modemask, + new_rtx, 1, OPTAB_DIRECT); + break; + +-- +2.11.0 +
Signature · 1 line
2.11.0
Thomas Petazzoni
AppliedPATCH 1/1 package/gcc: xtensa: fix atomic NAND code generation
Hello,
Quoted 5 lines · Max Filippov
xtensa gcc incorrectly generates code for atomic NAND operation as ~a1 & a2 instead of ~(a1 & a2). Fix that.
Backported from: r264087
Signed-off-by Max Filippov <[email protected]>
Quoted 8 lines
--- ...nsa-fix-NAND-code-in-xtensa_expand_atomic.patch | 39 ++++++++++++++++++++++ ...nsa-fix-NAND-code-in-xtensa_expand_atomic.patch | 39 ++++++++++++++++++++++ ...nsa-fix-NAND-code-in-xtensa_expand_atomic.patch | 39 ++++++++++++++++++++++ 3 files changed, 117 insertions(+) create mode 100644 package/gcc/6.4.0/872-gcc-xtensa-fix-NAND-code-in-xtensa_expand_atomic.patch create mode 100644 package/gcc/7.3.0/0003-gcc-xtensa-fix-NAND-code-in-xtensa_expand_atomic.patch create mode 100644 package/gcc/8.2.0/0004-gcc-xtensa-fix-NAND-code-in-xtensa_expand_atomic.patch
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons) Embedded Linux and Kernel engineering https://bootlin.com
PATCH 1/1 package/gcc: xtensa: fix atomic NAND code generation
In reply to Max FilippovQuoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Max" == Max Filippov <[email protected]> writes:
xtensa gcc incorrectly generates code for atomic NAND operation as ~a1 & a2 instead of ~(a1 & a2). Fix that.
Backported from: r264087
Signed-off-by Max Filippov <[email protected]>
Committed to 2018.02.x and 2018.05.x after dropping the gcc 8.x patch, thanks.
Signature · 1 line
Bye, Peter Korsgaard