| Message ID | 54E7728B.1040706@linux.vnet.ibm.com |
|---|---|
| State | New |
| Headers | show |
On Fri, 2015-02-20 at 15:44 -0200, Adhemerval Zanella wrote: > gcc/ChangeLog: > > * config/rs6000/htm.md (tcheck): Fix assembly encoding. > > gcc/testsuite/ChangeLog > > * gcc.target/powerpc/htm-builtin-1.c: Fix tcheck expect value. You are correct that the tcheck insn does not have a '.' in its mnemonic, so maybe this patch falls under the obvious rule? It also goes to show that no one has actually used __builtin_tcheck() before in a real progran, since the assembler would have flagged this as an unknown opcode. Thanks for fixing my mistake! Peter
On Fri, Feb 20, 2015 at 12:44 PM, Adhemerval Zanella <azanella@linux.vnet.ibm.com> wrote: > gcc/ChangeLog: > > * config/rs6000/htm.md (tcheck): Fix assembly encoding. > > gcc/testsuite/ChangeLog > > * gcc.target/powerpc/htm-builtin-1.c: Fix tcheck expect value. Okay. Thanks, David
On Fri, 2015-02-20 at 15:43 -0500, David Edelsohn wrote: > On Fri, Feb 20, 2015 at 12:44 PM, Adhemerval Zanella > <azanella@linux.vnet.ibm.com> wrote: > > gcc/ChangeLog: > > > > * config/rs6000/htm.md (tcheck): Fix assembly encoding. > > > > gcc/testsuite/ChangeLog > > > > * gcc.target/powerpc/htm-builtin-1.c: Fix tcheck expect value. > > > Okay. This is broken on 4.9 and 4.8, so can we get those fixed as well? Peter
On Mon, Feb 23, 2015 at 1:26 PM, Peter Bergner <bergner@vnet.ibm.com> wrote: > On Fri, 2015-02-20 at 15:43 -0500, David Edelsohn wrote: >> On Fri, Feb 20, 2015 at 12:44 PM, Adhemerval Zanella >> <azanella@linux.vnet.ibm.com> wrote: >> > gcc/ChangeLog: >> > >> > * config/rs6000/htm.md (tcheck): Fix assembly encoding. >> > >> > gcc/testsuite/ChangeLog >> > >> > * gcc.target/powerpc/htm-builtin-1.c: Fix tcheck expect value. >> >> >> Okay. > > This is broken on 4.9 and 4.8, so can we get those fixed as well? Yes, please backport. Again, a testcase is highly encouraged. Thanks, David
On Mon, 2015-02-23 at 13:42 -0500, David Edelsohn wrote: > On Mon, Feb 23, 2015 at 1:26 PM, Peter Bergner <bergner@vnet.ibm.com> wrote: > > This is broken on 4.9 and 4.8, so can we get those fixed as well? > > Yes, please backport. I committed this to trunk on Adhemerval's behalf as revision 220992. I'll commit it to 4.9 and 4.8 after I bootstrap/regtest it there. > Again, a testcase is highly encouraged. I have a separate HTM fix coming which will fix PR64579 as well as a few things that popped up when looking into that one. I'm adding a test case to that patch which should cover this. Peter
On Wed, 2015-02-25 at 16:22 -0600, Peter Bergner wrote: > On Mon, 2015-02-23 at 13:42 -0500, David Edelsohn wrote: > > On Mon, Feb 23, 2015 at 1:26 PM, Peter Bergner <bergner@vnet.ibm.com> wrote: > > > This is broken on 4.9 and 4.8, so can we get those fixed as well? > > > > Yes, please backport. > > I committed this to trunk on Adhemerval's behalf as revision 220992. > I'll commit it to 4.9 and 4.8 after I bootstrap/regtest it there. Ok, committed to 4.9 as revision 221018 and 4.8 as revision 221019. Thanks. Peter
diff --git a/gcc/config/rs6000/htm.md b/gcc/config/rs6000/htm.md index 2c4689f..79fb740 100644 --- a/gcc/config/rs6000/htm.md +++ b/gcc/config/rs6000/htm.md @@ -252,7 +252,7 @@ (unspec_volatile:CC [(match_operand 0 "u3bit_cint_operand" "n")] UNSPECV_HTM_TCHECK))] "TARGET_HTM" - "tcheck. %0" + "tcheck %0" [(set_attr "type" "htm") (set_attr "length" "4")]) diff --git a/gcc/testsuite/gcc.target/powerpc/htm-builtin-1.c b/gcc/testsuite/gcc.target/powerpc/htm-builtin-1.c index e58816a..62d64e6 100644 --- a/gcc/testsuite/gcc.target/powerpc/htm-builtin-1.c +++ b/gcc/testsuite/gcc.target/powerpc/htm-builtin-1.c @@ -10,7 +10,7 @@ /* { dg-final { scan-assembler-times "tabortdci\\." 1 } } */ /* { dg-final { scan-assembler-times "tabortwc\\." 1 } } */ /* { dg-final { scan-assembler-times "tabortwci\\." 2 } } */ -/* { dg-final { scan-assembler-times "tcheck\\." 1 } } */ +/* { dg-final { scan-assembler-times "tcheck" 1 } } */ /* { dg-final { scan-assembler-times "trechkpt\\." 1 } } */ /* { dg-final { scan-assembler-times "treclaim\\." 1 } } */ /* { dg-final { scan-assembler-times "tsr\\." 3 } } */