paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-16 00:42:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

* convert (s*[const. set])<>/=[] for var. sets into or'ed in nodes, if const. set contains only a few elements

Browse Source 
git-svn-id: trunk@35526 -
This commit is contained in:
florian 2017-03-05 20:29:22 +00:00
parent e37ddbf2f5
commit 13b3866552
2 changed files with 76 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
compiler/nadd.pas
View File

@ -3118,6 +3118,12 @@ implementation
function taddnode.pass_1 : tnode;
function isconstsetfewelements(p : tnode) : boolean;
begin
result:=(p.nodetype=setconstn) and (tsetconstnode(p).elements<=4);
end;
var
{$ifdef addstringopt}
hp : tnode;
@ -3128,6 +3134,10 @@ implementation
{$ifdef cpuneedsmulhelper}
procname : string[32];
{$endif cpuneedsmulhelper}
tempn,varsetnode: tnode;
mulnode : taddnode;
constsetnode : tsetconstnode;
createinnodes : Boolean;
begin
result:=nil;
{ Can we optimize multiple string additions into a single call?
@ -3138,6 +3148,56 @@ implementation
result:=genmultistringadd(self);
exit;
end;
{ typical set tests like (s*[const. set])<>/=[] can be converted into an or'ed chain of in tests
for var sets if const. set contains only a few elements }
if (cs_opt_level1 in current_settings.optimizerswitches) and (nodetype in [unequaln,equaln]) and (left.resultdef.typ=setdef) and not(is_smallset(left.resultdef)) then
begin
createinnodes:=false;
mulnode:=nil;
if (is_emptyset(right) and (left.nodetype=muln) and
(isconstsetfewelements(taddnode(left).right) or isconstsetfewelements(taddnode(left).left))) then
begin
createinnodes:=true;
mulnode:=taddnode(left);
end
else if (is_emptyset(left) and (right.nodetype=muln) and
(isconstsetfewelements(taddnode(right).right) or isconstsetfewelements(taddnode(right).left))) then
begin
createinnodes:=true;
mulnode:=taddnode(right);
end;
if createinnodes then
begin
constsetnode:=nil;
varsetnode:=nil;
if isconstsetfewelements(mulnode.right) then
begin
constsetnode:=tsetconstnode(mulnode.right);
varsetnode:=mulnode.left;
end
else
begin
constsetnode:=tsetconstnode(mulnode.left);
varsetnode:=mulnode.right;
end;
result:=nil;
for i:=low(tconstset) to high(tconstset) do
if i in constsetnode.value_set^ then
begin
tempn:=cinnode.create(cordconstnode.create(i,tsetdef(constsetnode.resultdef).elementdef,false),varsetnode.getcopy);
if assigned(result) then
result:=caddnode.create_internal(orn,result,tempn)
else
result:=tempn;
end;
if nodetype=equaln then
result:=cnotnode.create(result);
exit;
end;
end;
{ first do the two subtrees }
firstpass(left);
firstpass(right);

19
compiler/ncon.pas
View File

@ -141,6 +141,7 @@ interface
function pass_1 : tnode;override;
function pass_typecheck:tnode;override;
function docompare(p: tnode) : boolean; override;
function elements : AInt;
end;
tsetconstnodeclass = class of tsetconstnode;
@ -1070,11 +1071,11 @@ implementation
typedef:=tdef(typedefderef.resolve);
end;
type
setbytes = array[0..31] of byte;
Psetbytes = ^setbytes;
procedure tsetconstnode.adjustforsetbase;
type
setbytes = array[0..31] of byte;
Psetbytes = ^setbytes;
var
i, diff: longint;
begin
@ -1146,6 +1147,18 @@ implementation
end;
function tsetconstnode.elements : AInt;
var
i : AInt;
begin
result:=0;
if not(assigned(value_set)) then
exit;
for i:=0 to tsetdef(resultdef).size-1 do
result:=result+ PopCnt(Psetbytes(value_set)^[i]);
end;
{*****************************************************************************
TNILNODE
*****************************************************************************}