mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-08-25 13:30:49 +02:00
* moved the conversion of "x:=x op k" to inline nodes to a separate optimization
pass, so that it can be done after other optimizations, such as constant propagation git-svn-id: trunk@35961 -
This commit is contained in:
nickysn
parent
3655388cae
commit
012153201a
1
.gitattributes
vendored
1
.gitattributes
vendored
@ -516,6 +516,7 @@ compiler/optdead.pas svneol=native#text/plain
|
|||||||
compiler/optdeadstore.pas svneol=native#text/pascal
|
compiler/optdeadstore.pas svneol=native#text/pascal
|
||||||
compiler/optdfa.pas svneol=native#text/plain
|
compiler/optdfa.pas svneol=native#text/plain
|
||||||
compiler/options.pas svneol=native#text/plain
|
compiler/options.pas svneol=native#text/plain
|
||||||
|
compiler/optloadmodifystore.pas svneol=native#text/plain
|
||||||
compiler/optloop.pas svneol=native#text/plain
|
compiler/optloop.pas svneol=native#text/plain
|
||||||
compiler/opttail.pas svneol=native#text/plain
|
compiler/opttail.pas svneol=native#text/plain
|
||||||
compiler/optutils.pas svneol=native#text/plain
|
compiler/optutils.pas svneol=native#text/plain
|
||||||
|
|||||||
@ -313,7 +313,8 @@ interface
|
|||||||
cs_opt_remove_emtpy_proc,
|
cs_opt_remove_emtpy_proc,
|
||||||
cs_opt_constant_propagate,
|
cs_opt_constant_propagate,
|
||||||
cs_opt_dead_store_eliminate,
|
cs_opt_dead_store_eliminate,
|
||||||
cs_opt_forcenostackframe
|
cs_opt_forcenostackframe,
|
||||||
|
cs_opt_use_load_modify_store
|
||||||
);
|
);
|
||||||
toptimizerswitches = set of toptimizerswitch;
|
toptimizerswitches = set of toptimizerswitch;
|
||||||
|
|
||||||
@ -335,14 +336,14 @@ interface
|
|||||||
end;
|
end;
|
||||||
|
|
||||||
const
|
const
|
||||||
OptimizerSwitchStr : array[toptimizerswitch] of string[17] = ('',
|
OptimizerSwitchStr : array[toptimizerswitch] of string[18] = ('',
|
||||||
'LEVEL1','LEVEL2','LEVEL3','LEVEL4',
|
'LEVEL1','LEVEL2','LEVEL3','LEVEL4',
|
||||||
'REGVAR','UNCERTAIN','SIZE','STACKFRAME',
|
'REGVAR','UNCERTAIN','SIZE','STACKFRAME',
|
||||||
'PEEPHOLE','LOOPUNROLL','TAILREC','CSE',
|
'PEEPHOLE','LOOPUNROLL','TAILREC','CSE',
|
||||||
'DFA','STRENGTH','SCHEDULE','AUTOINLINE','USEEBP','USERBP',
|
'DFA','STRENGTH','SCHEDULE','AUTOINLINE','USEEBP','USERBP',
|
||||||
'ORDERFIELDS','FASTMATH','DEADVALUES','REMOVEEMPTYPROCS',
|
'ORDERFIELDS','FASTMATH','DEADVALUES','REMOVEEMPTYPROCS',
|
||||||
'CONSTPROP',
|
'CONSTPROP',
|
||||||
'DEADSTORE','FORCENOSTACKFRAME'
|
'DEADSTORE','FORCENOSTACKFRAME','USELOADMODIFYSTORE'
|
||||||
);
|
);
|
||||||
WPOptimizerSwitchStr : array [twpoptimizerswitch] of string[14] = (
|
WPOptimizerSwitchStr : array [twpoptimizerswitch] of string[14] = (
|
||||||
'DEVIRTCALLS','OPTVMTS','SYMBOLLIVENESS'
|
'DEVIRTCALLS','OPTVMTS','SYMBOLLIVENESS'
|
||||||
@ -368,7 +369,7 @@ interface
|
|||||||
{ switches being applied to all CPUs at the given level }
|
{ switches being applied to all CPUs at the given level }
|
||||||
genericlevel1optimizerswitches = [cs_opt_level1,cs_opt_peephole];
|
genericlevel1optimizerswitches = [cs_opt_level1,cs_opt_peephole];
|
||||||
genericlevel2optimizerswitches = [cs_opt_level2,cs_opt_remove_emtpy_proc];
|
genericlevel2optimizerswitches = [cs_opt_level2,cs_opt_remove_emtpy_proc];
|
||||||
genericlevel3optimizerswitches = [cs_opt_level3,cs_opt_constant_propagate,cs_opt_nodedfa];
|
genericlevel3optimizerswitches = [cs_opt_level3,cs_opt_constant_propagate,cs_opt_nodedfa,cs_opt_use_load_modify_store];
|
||||||
genericlevel4optimizerswitches = [cs_opt_level4,cs_opt_reorder_fields,cs_opt_dead_values,cs_opt_fastmath];
|
genericlevel4optimizerswitches = [cs_opt_level4,cs_opt_reorder_fields,cs_opt_dead_values,cs_opt_fastmath];
|
||||||
|
|
||||||
{ whole program optimizations whose information generation requires
|
{ whole program optimizations whose information generation requires
|
||||||
|
|||||||
213
compiler/nld.pas
213
compiler/nld.pas
@ -551,8 +551,6 @@ implementation
|
|||||||
|
|
||||||
|
|
||||||
function tassignmentnode.simplify(forinline : boolean) : tnode;
|
function tassignmentnode.simplify(forinline : boolean) : tnode;
|
||||||
var
|
|
||||||
newinlinenodetype : byte;
|
|
||||||
begin
|
begin
|
||||||
result:=nil;
|
result:=nil;
|
||||||
{ assignment nodes can perform several floating point }
|
{ assignment nodes can perform several floating point }
|
||||||
@ -565,217 +563,6 @@ implementation
|
|||||||
is_constrealnode(right) and
|
is_constrealnode(right) and
|
||||||
not equal_defs(right.resultdef,left.resultdef) then
|
not equal_defs(right.resultdef,left.resultdef) then
|
||||||
inserttypeconv(right,left.resultdef);
|
inserttypeconv(right,left.resultdef);
|
||||||
|
|
||||||
if cs_opt_level2 in current_settings.optimizerswitches then
|
|
||||||
begin
|
|
||||||
{ replace i:=succ/pred(i) by inc/dec(i)? }
|
|
||||||
if (right.nodetype=inlinen) and
|
|
||||||
((tinlinenode(right).inlinenumber=in_succ_x) or (tinlinenode(right).inlinenumber=in_pred_x)) and
|
|
||||||
(tinlinenode(right).left.isequal(left)) and
|
|
||||||
((localswitches*[cs_check_overflow,cs_check_range])=[]) and
|
|
||||||
((right.localswitches*[cs_check_overflow,cs_check_range])=[]) and
|
|
||||||
valid_for_var(tinlinenode(right).left,false) and
|
|
||||||
not(might_have_sideeffects(tinlinenode(right).left)) then
|
|
||||||
begin
|
|
||||||
if tinlinenode(right).inlinenumber=in_succ_x then
|
|
||||||
newinlinenodetype:=in_inc_x
|
|
||||||
else
|
|
||||||
newinlinenodetype:=in_dec_x;
|
|
||||||
result:=cinlinenode.createintern(
|
|
||||||
newinlinenodetype,false,ccallparanode.create(
|
|
||||||
tinlinenode(right).left,nil));
|
|
||||||
tinlinenode(right).left:=nil;
|
|
||||||
exit;
|
|
||||||
end;
|
|
||||||
if cs_opt_level3 in current_settings.optimizerswitches then
|
|
||||||
begin
|
|
||||||
{ replace i:=i+k by inc(i,k)
|
|
||||||
i:=i-k by dec(i,k)
|
|
||||||
i:=i and/or/xor k by in_[and/or/xor]_assign_x_y(i,k)
|
|
||||||
|
|
||||||
this handles the case, where there are no implicit type conversions }
|
|
||||||
if (right.nodetype in [addn,subn,andn,orn,xorn]) and
|
|
||||||
(taddnode(right).left.isequal(left)) and
|
|
||||||
is_integer(taddnode(right).left.resultdef) and
|
|
||||||
is_integer(taddnode(right).right.resultdef) and
|
|
||||||
((localswitches*[cs_check_overflow,cs_check_range])=[]) and
|
|
||||||
((right.localswitches*[cs_check_overflow,cs_check_range])=[]) and
|
|
||||||
valid_for_var(taddnode(right).left,false) and
|
|
||||||
not(might_have_sideeffects(taddnode(right).left)) then
|
|
||||||
begin
|
|
||||||
case right.nodetype of
|
|
||||||
addn:
|
|
||||||
newinlinenodetype:=in_inc_x;
|
|
||||||
subn:
|
|
||||||
newinlinenodetype:=in_dec_x;
|
|
||||||
andn:
|
|
||||||
newinlinenodetype:=in_and_assign_x_y;
|
|
||||||
orn:
|
|
||||||
newinlinenodetype:=in_or_assign_x_y;
|
|
||||||
xorn:
|
|
||||||
newinlinenodetype:=in_xor_assign_x_y;
|
|
||||||
else
|
|
||||||
internalerror(2017032901);
|
|
||||||
end;
|
|
||||||
if right.nodetype in [addn,subn] then
|
|
||||||
result:=cinlinenode.createintern(
|
|
||||||
newinlinenodetype,false,ccallparanode.create(
|
|
||||||
taddnode(right).left,ccallparanode.create(taddnode(right).right,nil)))
|
|
||||||
else
|
|
||||||
result:=cinlinenode.createintern(
|
|
||||||
newinlinenodetype,false,ccallparanode.create(
|
|
||||||
taddnode(right).right,ccallparanode.create(taddnode(right).left,nil)));
|
|
||||||
taddnode(right).left:=nil;
|
|
||||||
taddnode(right).right:=nil;
|
|
||||||
exit;
|
|
||||||
end;
|
|
||||||
{ replace i:=i+k by inc(i,k)
|
|
||||||
i:=i-k by dec(i,k)
|
|
||||||
i:=i and/or/xor k by in_[and/or/xor]_assign_x_y(i,k)
|
|
||||||
|
|
||||||
this handles the case with two conversions (outer and inner):
|
|
||||||
outer typeconv: right
|
|
||||||
add/sub/and/or/xor: ttypeconvnode(right).left
|
|
||||||
inner typeconv: taddnode(ttypeconvnode(right).left).left
|
|
||||||
right side 'i': ttypeconvnode(taddnode(ttypeconvnode(right).left).left).left
|
|
||||||
right side 'k': taddnode(ttypeconvnode(right).left).right }
|
|
||||||
if (right.nodetype=typeconvn) and
|
|
||||||
(ttypeconvnode(right).convtype=tc_int_2_int) and
|
|
||||||
(ttypeconvnode(right).left.nodetype in [addn,subn,andn,orn,xorn]) and
|
|
||||||
is_integer(ttypeconvnode(right).left.resultdef) and
|
|
||||||
(right.resultdef.size<=ttypeconvnode(right).left.resultdef.size) and
|
|
||||||
(taddnode(ttypeconvnode(right).left).left.nodetype=typeconvn) and
|
|
||||||
(ttypeconvnode(taddnode(ttypeconvnode(right).left).left).convtype=tc_int_2_int) and
|
|
||||||
are_equal_ints(right.resultdef,ttypeconvnode(taddnode(ttypeconvnode(right).left).left).left.resultdef) and
|
|
||||||
ttypeconvnode(taddnode(ttypeconvnode(right).left).left).left.isequal(left) and
|
|
||||||
is_integer(taddnode(ttypeconvnode(right).left).left.resultdef) and
|
|
||||||
is_integer(taddnode(ttypeconvnode(right).left).right.resultdef) and
|
|
||||||
is_integer(ttypeconvnode(taddnode(ttypeconvnode(right).left).left).left.resultdef) and
|
|
||||||
((localswitches*[cs_check_overflow,cs_check_range])=[]) and
|
|
||||||
((right.localswitches*[cs_check_overflow,cs_check_range])=[]) and
|
|
||||||
valid_for_var(ttypeconvnode(taddnode(ttypeconvnode(right).left).left).left,false) and
|
|
||||||
not(might_have_sideeffects(ttypeconvnode(taddnode(ttypeconvnode(right).left).left).left)) then
|
|
||||||
begin
|
|
||||||
case ttypeconvnode(right).left.nodetype of
|
|
||||||
addn:
|
|
||||||
newinlinenodetype:=in_inc_x;
|
|
||||||
subn:
|
|
||||||
newinlinenodetype:=in_dec_x;
|
|
||||||
andn:
|
|
||||||
newinlinenodetype:=in_and_assign_x_y;
|
|
||||||
orn:
|
|
||||||
newinlinenodetype:=in_or_assign_x_y;
|
|
||||||
xorn:
|
|
||||||
newinlinenodetype:=in_xor_assign_x_y;
|
|
||||||
else
|
|
||||||
internalerror(2017032901);
|
|
||||||
end;
|
|
||||||
inserttypeconv_internal(taddnode(ttypeconvnode(right).left).right,left.resultdef);
|
|
||||||
if ttypeconvnode(right).left.nodetype in [addn,subn] then
|
|
||||||
result:=cinlinenode.createintern(
|
|
||||||
newinlinenodetype,false,ccallparanode.create(
|
|
||||||
ttypeconvnode(taddnode(ttypeconvnode(right).left).left).left,ccallparanode.create(taddnode(ttypeconvnode(right).left).right,nil)))
|
|
||||||
else
|
|
||||||
result:=cinlinenode.createintern(
|
|
||||||
newinlinenodetype,false,ccallparanode.create(
|
|
||||||
taddnode(ttypeconvnode(right).left).right,ccallparanode.create(ttypeconvnode(taddnode(ttypeconvnode(right).left).left).left,nil)));
|
|
||||||
ttypeconvnode(taddnode(ttypeconvnode(right).left).left).left:=nil;
|
|
||||||
taddnode(ttypeconvnode(right).left).right:=nil;
|
|
||||||
exit;
|
|
||||||
end;
|
|
||||||
{ replace i:=k+i by inc(i,k)
|
|
||||||
i:=k and/or/xor i by in_[and/or/xor]_assign_x_y(i,k)
|
|
||||||
todo: for some integer types, there are extra implicit
|
|
||||||
typecasts inserted by the compiler; this code should be
|
|
||||||
updated to handle them as well }
|
|
||||||
if (right.nodetype in [addn,andn,orn,xorn]) and
|
|
||||||
(taddnode(right).right.isequal(left)) and
|
|
||||||
is_integer(taddnode(right).left.resultdef) and
|
|
||||||
is_integer(taddnode(right).right.resultdef) and
|
|
||||||
((localswitches*[cs_check_overflow,cs_check_range])=[]) and
|
|
||||||
((right.localswitches*[cs_check_overflow,cs_check_range])=[]) and
|
|
||||||
valid_for_var(taddnode(right).right,false) and
|
|
||||||
not(might_have_sideeffects(taddnode(right).right)) then
|
|
||||||
begin
|
|
||||||
case right.nodetype of
|
|
||||||
addn:
|
|
||||||
newinlinenodetype:=in_inc_x;
|
|
||||||
andn:
|
|
||||||
newinlinenodetype:=in_and_assign_x_y;
|
|
||||||
orn:
|
|
||||||
newinlinenodetype:=in_or_assign_x_y;
|
|
||||||
xorn:
|
|
||||||
newinlinenodetype:=in_xor_assign_x_y;
|
|
||||||
else
|
|
||||||
internalerror(2017032902);
|
|
||||||
end;
|
|
||||||
if right.nodetype=addn then
|
|
||||||
result:=cinlinenode.createintern(
|
|
||||||
newinlinenodetype,false,ccallparanode.create(
|
|
||||||
taddnode(right).right,ccallparanode.create(taddnode(right).left,nil)))
|
|
||||||
else
|
|
||||||
result:=cinlinenode.createintern(
|
|
||||||
newinlinenodetype,false,ccallparanode.create(
|
|
||||||
taddnode(right).left,ccallparanode.create(taddnode(right).right,nil)));
|
|
||||||
taddnode(right).right:=nil;
|
|
||||||
taddnode(right).left:=nil;
|
|
||||||
exit;
|
|
||||||
end;
|
|
||||||
{ replace i:=not i by in_not_assign_x(i)
|
|
||||||
i:=-i by in_neg_assign_x(i)
|
|
||||||
|
|
||||||
this handles the case, where there are no implicit type conversions }
|
|
||||||
if (right.nodetype in [notn,unaryminusn]) and
|
|
||||||
(tunarynode(right).left.isequal(left)) and
|
|
||||||
is_integer(tunarynode(right).left.resultdef) and
|
|
||||||
((localswitches*[cs_check_overflow,cs_check_range])=[]) and
|
|
||||||
((right.localswitches*[cs_check_overflow,cs_check_range])=[]) and
|
|
||||||
valid_for_var(tunarynode(right).left,false) and
|
|
||||||
not(might_have_sideeffects(tunarynode(right).left)) then
|
|
||||||
begin
|
|
||||||
if right.nodetype=notn then
|
|
||||||
newinlinenodetype:=in_not_assign_x
|
|
||||||
else
|
|
||||||
newinlinenodetype:=in_neg_assign_x;
|
|
||||||
result:=cinlinenode.createintern(
|
|
||||||
newinlinenodetype,false,tunarynode(right).left);
|
|
||||||
tunarynode(right).left:=nil;
|
|
||||||
exit;
|
|
||||||
end;
|
|
||||||
{ replace i:=not i by in_not_assign_x(i)
|
|
||||||
i:=-i by in_neg_assign_x(i)
|
|
||||||
|
|
||||||
this handles the case with type conversions:
|
|
||||||
outer typeconv: right
|
|
||||||
neg/not: ttypeconvnode(right).left
|
|
||||||
inner typeconv: tunarynode(ttypeconvnode(right).left).left
|
|
||||||
right side 'i': ttypeconvnode(tunarynode(ttypeconvnode(right).left).left).left }
|
|
||||||
if (right.nodetype=typeconvn) and
|
|
||||||
(ttypeconvnode(right).convtype=tc_int_2_int) and
|
|
||||||
(ttypeconvnode(right).left.nodetype in [notn,unaryminusn]) and
|
|
||||||
is_integer(ttypeconvnode(right).left.resultdef) and
|
|
||||||
(right.resultdef.size<=ttypeconvnode(right).left.resultdef.size) and
|
|
||||||
(tunarynode(ttypeconvnode(right).left).left.nodetype=typeconvn) and
|
|
||||||
(ttypeconvnode(tunarynode(ttypeconvnode(right).left).left).convtype=tc_int_2_int) and
|
|
||||||
are_equal_ints(right.resultdef,ttypeconvnode(tunarynode(ttypeconvnode(right).left).left).left.resultdef) and
|
|
||||||
ttypeconvnode(tunarynode(ttypeconvnode(right).left).left).left.isequal(left) and
|
|
||||||
is_integer(ttypeconvnode(tunarynode(ttypeconvnode(right).left).left).left.resultdef) and
|
|
||||||
((localswitches*[cs_check_overflow,cs_check_range])=[]) and
|
|
||||||
((right.localswitches*[cs_check_overflow,cs_check_range])=[]) and
|
|
||||||
valid_for_var(ttypeconvnode(tunarynode(ttypeconvnode(right).left).left).left,false) and
|
|
||||||
not(might_have_sideeffects(ttypeconvnode(tunarynode(ttypeconvnode(right).left).left).left)) then
|
|
||||||
begin
|
|
||||||
if ttypeconvnode(right).left.nodetype=notn then
|
|
||||||
newinlinenodetype:=in_not_assign_x
|
|
||||||
else
|
|
||||||
newinlinenodetype:=in_neg_assign_x;
|
|
||||||
result:=cinlinenode.createintern(
|
|
||||||
newinlinenodetype,false,ttypeconvnode(tunarynode(ttypeconvnode(right).left).left).left);
|
|
||||||
ttypeconvnode(tunarynode(ttypeconvnode(right).left).left).left:=nil;
|
|
||||||
exit;
|
|
||||||
end;
|
|
||||||
end;
|
|
||||||
end;
|
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
281
compiler/optloadmodifystore.pas
Normal file
281
compiler/optloadmodifystore.pas
Normal file
@ -0,0 +1,281 @@
|
|||||||
|
{
|
||||||
|
Copyright (c) 2017 by Nikolay Nikolov
|
||||||
|
|
||||||
|
Optimizations for making use of load-modify-store operations in CISC-like
|
||||||
|
instruction set architectures (such as x86)
|
||||||
|
|
||||||
|
This program is free software; you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation; either version 2 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program; if not, write to the Free Software
|
||||||
|
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||||
|
|
||||||
|
****************************************************************************
|
||||||
|
}
|
||||||
|
|
||||||
|
unit optloadmodifystore;
|
||||||
|
|
||||||
|
{$i fpcdefs.inc}
|
||||||
|
|
||||||
|
interface
|
||||||
|
|
||||||
|
uses
|
||||||
|
node;
|
||||||
|
|
||||||
|
procedure do_optloadmodifystore(var rootnode : tnode);
|
||||||
|
|
||||||
|
implementation
|
||||||
|
|
||||||
|
uses
|
||||||
|
globtype,verbose,nutils,
|
||||||
|
defutil,defcmp,htypechk,pass_1,
|
||||||
|
nadd,ncal,ncnv,ninl,nld;
|
||||||
|
|
||||||
|
function try_opt_assignmentnode(assignmentnode: tassignmentnode): tnode;
|
||||||
|
var
|
||||||
|
newinlinenodetype: byte;
|
||||||
|
begin
|
||||||
|
result:=nil;
|
||||||
|
with assignmentnode do
|
||||||
|
begin
|
||||||
|
{ replace i:=succ/pred(i) by inc/dec(i)? }
|
||||||
|
if (right.nodetype=inlinen) and
|
||||||
|
((tinlinenode(right).inlinenumber=in_succ_x) or (tinlinenode(right).inlinenumber=in_pred_x)) and
|
||||||
|
(tinlinenode(right).left.isequal(left)) and
|
||||||
|
((localswitches*[cs_check_overflow,cs_check_range])=[]) and
|
||||||
|
((right.localswitches*[cs_check_overflow,cs_check_range])=[]) and
|
||||||
|
valid_for_var(tinlinenode(right).left,false) and
|
||||||
|
not(might_have_sideeffects(tinlinenode(right).left)) then
|
||||||
|
begin
|
||||||
|
if tinlinenode(right).inlinenumber=in_succ_x then
|
||||||
|
newinlinenodetype:=in_inc_x
|
||||||
|
else
|
||||||
|
newinlinenodetype:=in_dec_x;
|
||||||
|
result:=cinlinenode.createintern(
|
||||||
|
newinlinenodetype,false,ccallparanode.create(
|
||||||
|
tinlinenode(right).left,nil));
|
||||||
|
tinlinenode(right).left:=nil;
|
||||||
|
exit;
|
||||||
|
end;
|
||||||
|
{ replace i:=i+k by inc(i,k)
|
||||||
|
i:=i-k by dec(i,k)
|
||||||
|
i:=i and/or/xor k by in_[and/or/xor]_assign_x_y(i,k)
|
||||||
|
|
||||||
|
this handles the case, where there are no implicit type conversions }
|
||||||
|
if (right.nodetype in [addn,subn,andn,orn,xorn]) and
|
||||||
|
(taddnode(right).left.isequal(left)) and
|
||||||
|
is_integer(taddnode(right).left.resultdef) and
|
||||||
|
is_integer(taddnode(right).right.resultdef) and
|
||||||
|
((localswitches*[cs_check_overflow,cs_check_range])=[]) and
|
||||||
|
((right.localswitches*[cs_check_overflow,cs_check_range])=[]) and
|
||||||
|
valid_for_var(taddnode(right).left,false) and
|
||||||
|
not(might_have_sideeffects(taddnode(right).left)) then
|
||||||
|
begin
|
||||||
|
case right.nodetype of
|
||||||
|
addn:
|
||||||
|
newinlinenodetype:=in_inc_x;
|
||||||
|
subn:
|
||||||
|
newinlinenodetype:=in_dec_x;
|
||||||
|
andn:
|
||||||
|
newinlinenodetype:=in_and_assign_x_y;
|
||||||
|
orn:
|
||||||
|
newinlinenodetype:=in_or_assign_x_y;
|
||||||
|
xorn:
|
||||||
|
newinlinenodetype:=in_xor_assign_x_y;
|
||||||
|
else
|
||||||
|
internalerror(2017032901);
|
||||||
|
end;
|
||||||
|
if right.nodetype in [addn,subn] then
|
||||||
|
result:=cinlinenode.createintern(
|
||||||
|
newinlinenodetype,false,ccallparanode.create(
|
||||||
|
taddnode(right).left,ccallparanode.create(taddnode(right).right,nil)))
|
||||||
|
else
|
||||||
|
result:=cinlinenode.createintern(
|
||||||
|
newinlinenodetype,false,ccallparanode.create(
|
||||||
|
taddnode(right).right,ccallparanode.create(taddnode(right).left,nil)));
|
||||||
|
taddnode(right).left:=nil;
|
||||||
|
taddnode(right).right:=nil;
|
||||||
|
exit;
|
||||||
|
end;
|
||||||
|
{ replace i:=i+k by inc(i,k)
|
||||||
|
i:=i-k by dec(i,k)
|
||||||
|
i:=i and/or/xor k by in_[and/or/xor]_assign_x_y(i,k)
|
||||||
|
|
||||||
|
this handles the case with two conversions (outer and inner):
|
||||||
|
outer typeconv: right
|
||||||
|
add/sub/and/or/xor: ttypeconvnode(right).left
|
||||||
|
inner typeconv: taddnode(ttypeconvnode(right).left).left
|
||||||
|
right side 'i': ttypeconvnode(taddnode(ttypeconvnode(right).left).left).left
|
||||||
|
right side 'k': taddnode(ttypeconvnode(right).left).right }
|
||||||
|
if (right.nodetype=typeconvn) and
|
||||||
|
(ttypeconvnode(right).convtype=tc_int_2_int) and
|
||||||
|
(ttypeconvnode(right).left.nodetype in [addn,subn,andn,orn,xorn]) and
|
||||||
|
is_integer(ttypeconvnode(right).left.resultdef) and
|
||||||
|
(right.resultdef.size<=ttypeconvnode(right).left.resultdef.size) and
|
||||||
|
(taddnode(ttypeconvnode(right).left).left.nodetype=typeconvn) and
|
||||||
|
(ttypeconvnode(taddnode(ttypeconvnode(right).left).left).convtype=tc_int_2_int) and
|
||||||
|
are_equal_ints(right.resultdef,ttypeconvnode(taddnode(ttypeconvnode(right).left).left).left.resultdef) and
|
||||||
|
ttypeconvnode(taddnode(ttypeconvnode(right).left).left).left.isequal(left) and
|
||||||
|
is_integer(taddnode(ttypeconvnode(right).left).left.resultdef) and
|
||||||
|
is_integer(taddnode(ttypeconvnode(right).left).right.resultdef) and
|
||||||
|
is_integer(ttypeconvnode(taddnode(ttypeconvnode(right).left).left).left.resultdef) and
|
||||||
|
((localswitches*[cs_check_overflow,cs_check_range])=[]) and
|
||||||
|
((right.localswitches*[cs_check_overflow,cs_check_range])=[]) and
|
||||||
|
valid_for_var(ttypeconvnode(taddnode(ttypeconvnode(right).left).left).left,false) and
|
||||||
|
not(might_have_sideeffects(ttypeconvnode(taddnode(ttypeconvnode(right).left).left).left)) then
|
||||||
|
begin
|
||||||
|
case ttypeconvnode(right).left.nodetype of
|
||||||
|
addn:
|
||||||
|
newinlinenodetype:=in_inc_x;
|
||||||
|
subn:
|
||||||
|
newinlinenodetype:=in_dec_x;
|
||||||
|
andn:
|
||||||
|
newinlinenodetype:=in_and_assign_x_y;
|
||||||
|
orn:
|
||||||
|
newinlinenodetype:=in_or_assign_x_y;
|
||||||
|
xorn:
|
||||||
|
newinlinenodetype:=in_xor_assign_x_y;
|
||||||
|
else
|
||||||
|
internalerror(2017032901);
|
||||||
|
end;
|
||||||
|
inserttypeconv_internal(taddnode(ttypeconvnode(right).left).right,left.resultdef);
|
||||||
|
if ttypeconvnode(right).left.nodetype in [addn,subn] then
|
||||||
|
result:=cinlinenode.createintern(
|
||||||
|
newinlinenodetype,false,ccallparanode.create(
|
||||||
|
ttypeconvnode(taddnode(ttypeconvnode(right).left).left).left,ccallparanode.create(taddnode(ttypeconvnode(right).left).right,nil)))
|
||||||
|
else
|
||||||
|
result:=cinlinenode.createintern(
|
||||||
|
newinlinenodetype,false,ccallparanode.create(
|
||||||
|
taddnode(ttypeconvnode(right).left).right,ccallparanode.create(ttypeconvnode(taddnode(ttypeconvnode(right).left).left).left,nil)));
|
||||||
|
ttypeconvnode(taddnode(ttypeconvnode(right).left).left).left:=nil;
|
||||||
|
taddnode(ttypeconvnode(right).left).right:=nil;
|
||||||
|
exit;
|
||||||
|
end;
|
||||||
|
{ replace i:=k+i by inc(i,k)
|
||||||
|
i:=k and/or/xor i by in_[and/or/xor]_assign_x_y(i,k)
|
||||||
|
todo: for some integer types, there are extra implicit
|
||||||
|
typecasts inserted by the compiler; this code should be
|
||||||
|
updated to handle them as well }
|
||||||
|
if (right.nodetype in [addn,andn,orn,xorn]) and
|
||||||
|
(taddnode(right).right.isequal(left)) and
|
||||||
|
is_integer(taddnode(right).left.resultdef) and
|
||||||
|
is_integer(taddnode(right).right.resultdef) and
|
||||||
|
((localswitches*[cs_check_overflow,cs_check_range])=[]) and
|
||||||
|
((right.localswitches*[cs_check_overflow,cs_check_range])=[]) and
|
||||||
|
valid_for_var(taddnode(right).right,false) and
|
||||||
|
not(might_have_sideeffects(taddnode(right).right)) then
|
||||||
|
begin
|
||||||
|
case right.nodetype of
|
||||||
|
addn:
|
||||||
|
newinlinenodetype:=in_inc_x;
|
||||||
|
andn:
|
||||||
|
newinlinenodetype:=in_and_assign_x_y;
|
||||||
|
orn:
|
||||||
|
newinlinenodetype:=in_or_assign_x_y;
|
||||||
|
xorn:
|
||||||
|
newinlinenodetype:=in_xor_assign_x_y;
|
||||||
|
else
|
||||||
|
internalerror(2017032902);
|
||||||
|
end;
|
||||||
|
if right.nodetype=addn then
|
||||||
|
result:=cinlinenode.createintern(
|
||||||
|
newinlinenodetype,false,ccallparanode.create(
|
||||||
|
taddnode(right).right,ccallparanode.create(taddnode(right).left,nil)))
|
||||||
|
else
|
||||||
|
result:=cinlinenode.createintern(
|
||||||
|
newinlinenodetype,false,ccallparanode.create(
|
||||||
|
taddnode(right).left,ccallparanode.create(taddnode(right).right,nil)));
|
||||||
|
taddnode(right).right:=nil;
|
||||||
|
taddnode(right).left:=nil;
|
||||||
|
exit;
|
||||||
|
end;
|
||||||
|
{ replace i:=not i by in_not_assign_x(i)
|
||||||
|
i:=-i by in_neg_assign_x(i)
|
||||||
|
|
||||||
|
this handles the case, where there are no implicit type conversions }
|
||||||
|
if (right.nodetype in [notn,unaryminusn]) and
|
||||||
|
(tunarynode(right).left.isequal(left)) and
|
||||||
|
is_integer(tunarynode(right).left.resultdef) and
|
||||||
|
((localswitches*[cs_check_overflow,cs_check_range])=[]) and
|
||||||
|
((right.localswitches*[cs_check_overflow,cs_check_range])=[]) and
|
||||||
|
valid_for_var(tunarynode(right).left,false) and
|
||||||
|
not(might_have_sideeffects(tunarynode(right).left)) then
|
||||||
|
begin
|
||||||
|
if right.nodetype=notn then
|
||||||
|
newinlinenodetype:=in_not_assign_x
|
||||||
|
else
|
||||||
|
newinlinenodetype:=in_neg_assign_x;
|
||||||
|
result:=cinlinenode.createintern(
|
||||||
|
newinlinenodetype,false,tunarynode(right).left);
|
||||||
|
tunarynode(right).left:=nil;
|
||||||
|
exit;
|
||||||
|
end;
|
||||||
|
{ replace i:=not i by in_not_assign_x(i)
|
||||||
|
i:=-i by in_neg_assign_x(i)
|
||||||
|
|
||||||
|
this handles the case with type conversions:
|
||||||
|
outer typeconv: right
|
||||||
|
neg/not: ttypeconvnode(right).left
|
||||||
|
inner typeconv: tunarynode(ttypeconvnode(right).left).left
|
||||||
|
right side 'i': ttypeconvnode(tunarynode(ttypeconvnode(right).left).left).left }
|
||||||
|
if (right.nodetype=typeconvn) and
|
||||||
|
(ttypeconvnode(right).convtype=tc_int_2_int) and
|
||||||
|
(ttypeconvnode(right).left.nodetype in [notn,unaryminusn]) and
|
||||||
|
is_integer(ttypeconvnode(right).left.resultdef) and
|
||||||
|
(right.resultdef.size<=ttypeconvnode(right).left.resultdef.size) and
|
||||||
|
(tunarynode(ttypeconvnode(right).left).left.nodetype=typeconvn) and
|
||||||
|
(ttypeconvnode(tunarynode(ttypeconvnode(right).left).left).convtype=tc_int_2_int) and
|
||||||
|
are_equal_ints(right.resultdef,ttypeconvnode(tunarynode(ttypeconvnode(right).left).left).left.resultdef) and
|
||||||
|
ttypeconvnode(tunarynode(ttypeconvnode(right).left).left).left.isequal(left) and
|
||||||
|
is_integer(ttypeconvnode(tunarynode(ttypeconvnode(right).left).left).left.resultdef) and
|
||||||
|
((localswitches*[cs_check_overflow,cs_check_range])=[]) and
|
||||||
|
((right.localswitches*[cs_check_overflow,cs_check_range])=[]) and
|
||||||
|
valid_for_var(ttypeconvnode(tunarynode(ttypeconvnode(right).left).left).left,false) and
|
||||||
|
not(might_have_sideeffects(ttypeconvnode(tunarynode(ttypeconvnode(right).left).left).left)) then
|
||||||
|
begin
|
||||||
|
if ttypeconvnode(right).left.nodetype=notn then
|
||||||
|
newinlinenodetype:=in_not_assign_x
|
||||||
|
else
|
||||||
|
newinlinenodetype:=in_neg_assign_x;
|
||||||
|
result:=cinlinenode.createintern(
|
||||||
|
newinlinenodetype,false,ttypeconvnode(tunarynode(ttypeconvnode(right).left).left).left);
|
||||||
|
ttypeconvnode(tunarynode(ttypeconvnode(right).left).left).left:=nil;
|
||||||
|
exit;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
|
||||||
|
function try_opt_node(var n: tnode; arg: pointer): foreachnoderesult;
|
||||||
|
var
|
||||||
|
hn : tnode;
|
||||||
|
begin
|
||||||
|
result:=fen_false;
|
||||||
|
if n.nodetype=assignn then
|
||||||
|
begin
|
||||||
|
hn:=try_opt_assignmentnode(tassignmentnode(n));
|
||||||
|
if assigned(hn) then
|
||||||
|
begin
|
||||||
|
n.free;
|
||||||
|
n:=hn;
|
||||||
|
typecheckpass(n);
|
||||||
|
do_firstpass(n);
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
end;
|
||||||
|
|
||||||
|
|
||||||
|
procedure do_optloadmodifystore(var rootnode : tnode);
|
||||||
|
begin
|
||||||
|
foreachnodestatic(pm_postprocess,rootnode,@try_opt_node,nil);
|
||||||
|
end;
|
||||||
|
|
||||||
|
end.
|
||||||
|
|
||||||
@ -1,7 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<CONFIG>
|
<CONFIG>
|
||||||
<ProjectOptions>
|
<ProjectOptions>
|
||||||
<Version Value="10"/>
|
<Version Value="9"/>
|
||||||
<PathDelim Value="\"/>
|
<PathDelim Value="\"/>
|
||||||
<General>
|
<General>
|
||||||
<Flags>
|
<Flags>
|
||||||
@ -28,7 +28,7 @@
|
|||||||
<LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
|
<LaunchingApplication PathPlusParams="\usr\X11R6\bin\xterm -T 'Lazarus Run Output' -e $(LazarusDir)\tools\runwait.sh $(TargetCmdLine)"/>
|
||||||
</local>
|
</local>
|
||||||
</RunParams>
|
</RunParams>
|
||||||
<Units Count="251">
|
<Units Count="252">
|
||||||
<Unit0>
|
<Unit0>
|
||||||
<Filename Value="pp.pas"/>
|
<Filename Value="pp.pas"/>
|
||||||
<IsPartOfProject Value="True"/>
|
<IsPartOfProject Value="True"/>
|
||||||
@ -449,6 +449,7 @@
|
|||||||
<Unit104>
|
<Unit104>
|
||||||
<Filename Value="aoptobj.pas"/>
|
<Filename Value="aoptobj.pas"/>
|
||||||
<IsPartOfProject Value="True"/>
|
<IsPartOfProject Value="True"/>
|
||||||
|
<UnitName Value="AoptObj"/>
|
||||||
</Unit104>
|
</Unit104>
|
||||||
<Unit105>
|
<Unit105>
|
||||||
<Filename Value="assemble.pas"/>
|
<Filename Value="assemble.pas"/>
|
||||||
@ -1035,6 +1036,10 @@
|
|||||||
<Filename Value="syscinfo.pas"/>
|
<Filename Value="syscinfo.pas"/>
|
||||||
<IsPartOfProject Value="True"/>
|
<IsPartOfProject Value="True"/>
|
||||||
</Unit250>
|
</Unit250>
|
||||||
|
<Unit251>
|
||||||
|
<Filename Value="optloadmodifystore.pas"/>
|
||||||
|
<IsPartOfProject Value="True"/>
|
||||||
|
</Unit251>
|
||||||
</Units>
|
</Units>
|
||||||
</ProjectOptions>
|
</ProjectOptions>
|
||||||
<CompilerOptions>
|
<CompilerOptions>
|
||||||
|
|||||||
@ -129,7 +129,8 @@ implementation
|
|||||||
optcse,
|
optcse,
|
||||||
optloop,
|
optloop,
|
||||||
optconstprop,
|
optconstprop,
|
||||||
optdeadstore
|
optdeadstore,
|
||||||
|
optloadmodifystore
|
||||||
{$if defined(arm)}
|
{$if defined(arm)}
|
||||||
,cpuinfo
|
,cpuinfo
|
||||||
{$endif arm}
|
{$endif arm}
|
||||||
@ -1437,6 +1438,9 @@ implementation
|
|||||||
if cs_opt_nodecse in current_settings.optimizerswitches then
|
if cs_opt_nodecse in current_settings.optimizerswitches then
|
||||||
do_optcse(code);
|
do_optcse(code);
|
||||||
|
|
||||||
|
if cs_opt_use_load_modify_store in current_settings.optimizerswitches then
|
||||||
|
do_optloadmodifystore(code);
|
||||||
|
|
||||||
{ only do secondpass if there are no errors }
|
{ only do secondpass if there are no errors }
|
||||||
if (ErrorCount=0) then
|
if (ErrorCount=0) then
|
||||||
begin
|
begin
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user