Skip to content

Bitwise const folding #2071

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

Merged
wixoaGit merged 5 commits into from
Nov 12, 2024
Merged

Bitwise const folding #2071

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
73e3e27
Bitwise const folding
Oct 29, 2024
869ae9e
Merge branch 'master' into bitnotfold
ike709 Nov 5, 2024
5516ed1
Update DMCompiler/DM/Builders/DMASTFolder.cs
ike709 Nov 5, 2024
1789357
Update DMCompiler/DM/Builders/DMASTFolder.cs
ike709 Nov 5, 2024
4d3d6eb
okay let's try resolving merge conflicts all over again
ike709 Nov 5, 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
21 changes: 0 additions & 21 deletions DMCompiler/DM/Builders/DMASTFolder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,27 +219,6 @@ private DMASTExpression FoldExpression(DMASTExpression? expression) {

break;
}
case DMASTBinaryAnd binaryAnd: {
if (binaryAnd is { LHS: DMASTConstantInteger lhsInt, RHS: DMASTConstantInteger rhsInt }) {
return new DMASTConstantInteger(expression.Location, lhsInt.Value & rhsInt.Value);
}

break;
}
case DMASTBinaryOr binaryOr: {
if (binaryOr is { LHS: DMASTConstantInteger lhsInt, RHS: DMASTConstantInteger rhsInt }) {
return new DMASTConstantInteger(expression.Location, lhsInt.Value | rhsInt.Value);
}

break;
}
case DMASTBinaryNot binaryNot: {
if (binaryNot.Value is DMASTConstantInteger exprInt) {
return new DMASTConstantInteger(expression.Location, (~exprInt.Value) & 0xFFFFFF);
}

break;
}
case DMASTAdd add: {
DMASTConstantString? lhsString = add.LHS as DMASTConstantString;
DMASTConstantString? rhsString = add.RHS as DMASTConstantString;
Expand Down
72 changes: 72 additions & 0 deletions DMCompiler/Optimizer/PeepholeOptimizations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,6 +618,78 @@ public void Apply(List<IAnnotatedBytecode> input, int index) {
}

#region Constant Folding

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

public void Apply(List<IAnnotatedBytecode> input, int index) {
var firstInstruction = IPeepholeOptimization.GetInstructionAndValue(input[index], out var pushVal1);

var args = new List<IAnnotatedBytecode>(1) {new AnnotatedBytecodeFloat(((~(int)pushVal1) & 0xFFFFFF), firstInstruction.Location)};

IPeepholeOptimization.ReplaceInstructions(input, index, 2,
new AnnotatedBytecodeInstruction(DreamProcOpcode.PushFloat, 1, args));
}
}

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

public void Apply(List<IAnnotatedBytecode> input, int index) {
var firstInstruction = IPeepholeOptimization.GetInstructionAndValue(input[index], out var pushVal1);

IPeepholeOptimization.GetInstructionAndValue(input[index + 1], out var pushVal2);

var args = new List<IAnnotatedBytecode>(1) {new AnnotatedBytecodeFloat(((int)pushVal1 | (int)pushVal2), firstInstruction.Location)};

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

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

public void Apply(List<IAnnotatedBytecode> input, int index) {
var firstInstruction = IPeepholeOptimization.GetInstructionAndValue(input[index], out var pushVal1);

IPeepholeOptimization.GetInstructionAndValue(input[index + 1], out var pushVal2);

var args = new List<IAnnotatedBytecode>(1) {new AnnotatedBytecodeFloat(((int)pushVal1 & (int)pushVal2), firstInstruction.Location)};

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

// PushFloat [constant]
// PushFloat [constant]
// Multiply
Expand Down