diff options
| author | Richard Biener <rguenther@suse.de> | 2023-02-17 12:36:44 +0100 |
|---|---|---|
| committer | Richard Biener <rguenther@suse.de> | 2023-02-17 12:36:44 +0100 |
| commit | 4c4f0f7acd6b96ee744ef598cbea5c7046a33654 (patch) | |
| tree | 8579b56b574593abadfa1d3c6862dbe5524fd964 | |
| parent | 417e95263ca4d7a6623783ad664cf6305d8d3fad (diff) | |
| download | gcc-4c4f0f7acd6b96ee744ef598cbea5c7046a33654.zip gcc-4c4f0f7acd6b96ee744ef598cbea5c7046a33654.tar.gz gcc-4c4f0f7acd6b96ee744ef598cbea5c7046a33654.tar.bz2 | |
tree-optimization/108821 - store motion and volatiles
The following fixes store motion to not re-issue volatile stores
to preserve TBAA behavior since that will result in the number
of volatile accesses changing.
PR tree-optimization/108821
* tree-ssa-loop-im.cc (sm_seq_valid_bb): We can also not
move volatile accesses.
* gcc.dg/tree-ssa/ssa-lim-24.c: New testcase.
| -rw-r--r-- | gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-24.c | 25 | ||||
| -rw-r--r-- | gcc/tree-ssa-loop-im.cc | 4 |
2 files changed, 28 insertions, 1 deletions
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-24.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-24.c new file mode 100644 index 0000000..6b46349 --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-lim-24.c @@ -0,0 +1,25 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -fdump-tree-lim2-details -fdump-tree-optimized" } */ + +extern volatile int *x; +static int gCrc; + +static int __attribute__((noinline)) crc16Add(int crc, int b) +{ + return crc + b; +} + +void f(int data, int dataSz) +{ + int i; + + for(i=0;i<dataSz;i++) + { + gCrc = crc16Add(gCrc, data); + *x = data; + } +} + +/* { dg-final { scan-tree-dump "Executing store motion of gCrc" "lim2" } } */ +/* { dg-final { scan-tree-dump-not "Re-issueing" "lim2" } } */ +/* { dg-final { scan-tree-dump-times "\\*x" 1 "optimized" } } */ diff --git a/gcc/tree-ssa-loop-im.cc b/gcc/tree-ssa-loop-im.cc index 784f6f0..86ce6ac 100644 --- a/gcc/tree-ssa-loop-im.cc +++ b/gcc/tree-ssa-loop-im.cc @@ -2605,7 +2605,9 @@ sm_seq_valid_bb (class loop *loop, basic_block bb, tree vdef, if (data->ref == UNANALYZABLE_MEM_ID) return -1; /* Stop at memory references which we can't move. */ - else if (memory_accesses.refs_list[data->ref]->mem.ref == error_mark_node) + else if (memory_accesses.refs_list[data->ref]->mem.ref == error_mark_node + || TREE_THIS_VOLATILE + (memory_accesses.refs_list[data->ref]->mem.ref)) { /* Mark refs_not_in_seq as unsupported. */ bitmap_ior_into (refs_not_supported, refs_not_in_seq); |