Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

String concat const folding #2061

Merged
merged 7 commits into from
Nov 17, 2024
Merged

String concat const folding #2061

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d285143
String concat const folding
Oct 25, 2024
a6261e6
Merge branch 'master' into stringfold
ike709 Nov 12, 2024
5bc9cef
Update DMCompiler/Optimizer/PeepholeOptimizations.cs
ike709 Nov 16, 2024
a87abb8
fix merge
ike709 Nov 16, 2024
5b41f9d
Merge remote-tracking branch 'origin/master' into stringfold
Nov 16, 2024
2bf720e
fix it for realsies
Nov 16, 2024
eef05aa
Update DMCompiler/Optimizer/PeepholeOptimizations.cs
wixoaGit Nov 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions DMCompiler/DM/Builders/DMASTFolder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,13 +219,6 @@ private DMASTExpression FoldExpression(DMASTExpression? expression) {

break;
}
case DMASTAdd add: {
DMASTConstantString? lhsString = add.LHS as DMASTConstantString;
DMASTConstantString? rhsString = add.RHS as DMASTConstantString;
if (lhsString != null && rhsString != null) return new DMASTConstantString(expression.Location, lhsString.Value + rhsString.Value);

break;
}

#endregion Math

Expand Down
4 changes: 4 additions & 0 deletions DMCompiler/Optimizer/AnnotatedBytecode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,10 @@ public void SetLocation(Location loc) {
public Location GetLocation() {
return Location;
}

public string ResolveString(DMCompiler compiler) {
return compiler.DMObjectTree.StringTable[Id];
}
}

internal sealed class AnnotatedBytecodeArgumentType(DMCallArgumentsType value, Location location) : IAnnotatedBytecode {
Expand Down
27 changes: 27 additions & 0 deletions DMCompiler/Optimizer/PeepholeOptimizations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,6 +767,33 @@ public void Apply(DMCompiler compiler, List<IAnnotatedBytecode> input, int index
}
}

// PushString [constant]
// PushString [constant]
// Add
// -> PushString [result]
internal sealed class ConstFoldAddStrings : IPeepholeOptimization {
public ReadOnlySpan<DreamProcOpcode> GetOpcodes() {
return [
DreamProcOpcode.PushString,
DreamProcOpcode.PushString,
DreamProcOpcode.Add,
];
}

public void Apply(DMCompiler compiler, List<IAnnotatedBytecode> input, int index) {
var firstInstruction = (AnnotatedBytecodeInstruction)input[index];
var firstString = firstInstruction.GetArg<AnnotatedBytecodeString>(0);
var secondString = ((AnnotatedBytecodeInstruction)input[index+1]).GetArg<AnnotatedBytecodeString>(0);

var combinedId = compiler.DMObjectTree.AddString(firstString.ResolveString(compiler) + secondString.ResolveString(compiler)); // TODO: Currently doesn't handle removing strings from the string tree that have no other references

var args = new List<IAnnotatedBytecode>(1) {new AnnotatedBytecodeString(combinedId, firstInstruction.Location)};

IPeepholeOptimization.ReplaceInstructions(input, index, 3,
new AnnotatedBytecodeInstruction(DreamProcOpcode.PushString, 1, args));
}
}

// PushFloat [constant]
// PushFloat [constant]
// Subtract
Expand Down
Loading