Skip to content

Commit

Permalink
Merge pull request #43566 from Thushara-Piyasekara/code-gen-optimizer…
Browse files Browse the repository at this point in the history 
…-feature

Fix testable pkg `InvocationData` handling logic for Dead Code Elimination
  • Loading branch information
@MaryamZi
MaryamZi authored Nov 11, 2024
2 parents af28a18 + 21cd4ae commit 095db58
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 18 deletions.
31 changes: 16 additions & 15 deletions compiler/ballerina-lang/src/main/java/io/ballerina/projects/UsedBIRNodeAnalyzer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ public void visit(BIRNode.BIRTypeDefinition typeDef) {
}

typeDef.markAsUsed();
currentInvocationData.addToUsedPool(typeDef);
getCurrentInvocationData().addToUsedPool(typeDef);
usedTypeDefAnalyzer.analyzeTypeDef(typeDef);
typeDef.attachedFuncs.forEach(
attachedFunc -> addDependentFunctionAndVisit(typeDef, attachedFunc, typeDef.type.tsymbol.pkgID));
Expand All @@ -197,8 +197,8 @@ public void visit(BIRNode.BIRTypeDefinition typeDef) {
public void visit(BIRNode.BIRBasicBlock birBasicBlock) {
Map<BIRNode.BIRVariableDcl, FunctionPointerData> previousLocalFpHolders = localFpHolders;
currentInstructionArr = birBasicBlock.instructions;
localFpHolders = new HashMap<>(currentInvocationData.globalVarFPDataPool);
localFpHolders.putAll(currentInvocationData.globalVarFPDataPool);
localFpHolders = new HashMap<>(getCurrentInvocationData().globalVarFPDataPool);
localFpHolders.putAll(getCurrentInvocationData().globalVarFPDataPool);

birBasicBlock.instructions.forEach(instruction -> {
if (ANALYZED_INSTRUCTION_KINDS.contains(instruction.getKind())) {
Expand All @@ -225,7 +225,7 @@ public void visit(BIRNode.BIRBasicBlock birBasicBlock) {
public void visit(BIRTerminator.Call call) {
// If function pointers are passed as parameters, they will be bound to the parent function
getUsedLocalFPHolders(call.args).forEach(var -> {
FunctionPointerData fpData = currentInvocationData.getFPData(var);
FunctionPointerData fpData = getCurrentInvocationData().getFPData(var);
if (fpData != null && fpData.lambdaFunction != null) {
visitNode(fpData.lambdaFunction);
}
Expand Down Expand Up @@ -263,9 +263,9 @@ public void visit(BIRTerminator.FPCall fpCall) {

FunctionPointerData fpData;
if (fpPointer instanceof BIRNode.BIRGlobalVariableDcl globalVariableDcl) {
fpData = currentInvocationData.globalVarFPDataPool.get(globalVariableDcl);
fpData = getCurrentInvocationData().globalVarFPDataPool.get(globalVariableDcl);
} else {
fpData = currentInvocationData.getFPData(fpCall.fp.variableDcl);
fpData = getCurrentInvocationData().getFPData(fpCall.fp.variableDcl);
}

if (fpData == null) {
Expand Down Expand Up @@ -327,15 +327,15 @@ private void initializeFpDataUsedState(BIRNode.BIRVariableDcl lambdaPointerVar,
*/
@Override
public void visit(BIRNonTerminator.RecordDefaultFPLoad recordDefaultFPLoad) {
FunctionPointerData fpData = currentInvocationData.getFPData(recordDefaultFPLoad.lhsOp.variableDcl);
FunctionPointerData fpData = getCurrentInvocationData().getFPData(recordDefaultFPLoad.lhsOp.variableDcl);
fpData.recordDefaultFPLoad = recordDefaultFPLoad;
if (fpData.recordDefaultFPLoad.enclosedType.isUsed) {
fpData.lambdaPointerVar.markAsUsed();
visitNode(fpData.lambdaFunction);
}
currentInvocationData.recordDefTypeWiseFPDataPool.putIfAbsent(recordDefaultFPLoad.enclosedType,
getCurrentInvocationData().recordDefTypeWiseFPDataPool.putIfAbsent(recordDefaultFPLoad.enclosedType,
new HashSet<>());
currentInvocationData.recordDefTypeWiseFPDataPool.get(recordDefaultFPLoad.enclosedType).add(fpData);
getCurrentInvocationData().recordDefTypeWiseFPDataPool.get(recordDefaultFPLoad.enclosedType).add(fpData);
}

@Override
Expand Down Expand Up @@ -435,7 +435,7 @@ private void analyzeGlobalVariableDeclUsage(BIRNode.BIRGlobalVariableDcl globalR
getInvocationData(globalRhsVar.pkgId)
.registerNodes(usedTypeDefAnalyzer, this.pkgCache.getBirPkg(globalRhsVar.pkgId));
} else if (isFunctionKindType(globalRhsVar.type)) {
visitNode(currentInvocationData.globalVarFPDataPool.get(globalRhsVar).lambdaFunction);
visitNode(getCurrentInvocationData().globalVarFPDataPool.get(globalRhsVar).lambdaFunction);
}
}

Expand All @@ -445,7 +445,7 @@ private void analyzeFunctionPointerReferences(Set<BIRNode.BIRVariableDcl> rhsVar
}
rhsVars.retainAll(localFpHolders.keySet());
for (BIRNode.BIRVariableDcl var : rhsVars) {
FunctionPointerData fpData = currentInvocationData.getFPData(var);
FunctionPointerData fpData = getCurrentInvocationData().getFPData(var);
if (fpData != null && fpData.lambdaFunction != null) {
visitNode(fpData.lambdaFunction);
}
Expand All @@ -459,7 +459,7 @@ private void registerUsedNativeClassPaths(BIRNode.BIRFunction birFunction) {
BIRNode.ConstValue constValue = ((BIRNode.BIRConstAnnotationAttachment) annot).annotValue;
String filePath =
((Map<String, BIRNode.ConstValue>) constValue.value).get(CLASS).value.toString();
currentInvocationData.usedNativeClassPaths.add(filePath.replace(".", "/") + DOT_CLASS);
getCurrentInvocationData().usedNativeClassPaths.add(filePath.replace(".", "/") + DOT_CLASS);
}
});
}
Expand Down Expand Up @@ -490,6 +490,10 @@ private void addDependentFunctionAndVisit(BIRNode.BIRDocumentableNode parentNode
childInvocationData.startPointNodes.add(childFunction);
}

public InvocationData getCurrentInvocationData() {
return isTestablePkgAnalysis? currentInvocationData.testablePkgInvocationData : currentInvocationData;
}

public static class InvocationData {

// Following Sets are used to whitelist the bal types called through ValueCreator in native dependencies
Expand Down Expand Up @@ -614,9 +618,6 @@ private void addToUsedPool(BIRNode.BIRFunction birFunction) {
void addToUsedPool(BIRNode.BIRTypeDefinition birTypeDef) {
if (this.unusedTypeDefs.remove(birTypeDef)) {
this.usedTypeDefs.add(birTypeDef);
} else if (this.testablePkgInvocationData != null) {
this.testablePkgInvocationData.unusedTypeDefs.remove(birTypeDef);
this.testablePkgInvocationData.usedTypeDefs.add(birTypeDef);
}
}

Expand Down
2 changes: 1 addition & 1 deletion compiler/ballerina-lang/src/main/java/io/ballerina/projects/UsedTypeDefAnalyzer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public void visitType(BType bType, AnalyzerData data) {
@Override
public void analyzeType(BType bType, AnalyzerData data) {
Set<UsedBIRNodeAnalyzer.FunctionPointerData> fpDataSet =
usedBIRNodeAnalyzer.currentInvocationData.getFpData(bType);
usedBIRNodeAnalyzer.getCurrentInvocationData().getFpData(bType);
if (fpDataSet != null) {
fpDataSet.forEach(fpData -> {
fpData.lambdaPointerVar.markAsUsed();
Expand Down
1 change: 1 addition & 0 deletions ...es/codegen-optimization-reports/optimized_test_run_test/dead_code_elimination_report.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"foo",
"fn",
"testUsageFunction",
"buildPkgFn",
"main",
"bar"
],
Expand Down
3 changes: 2 additions & 1 deletion ...ources/command-outputs/unix/OptimizedExecutableTestingTest-testWithCommonDependencies.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@ Running Tests
optimized_test_run_test
[pass] importUsageTest
[pass] simpleTest
[pass] testFPCallToBuildPkgFromTestablePkg
[pass] testFn
[pass] unusedFunctionInvoker


4 passing
5 passing
0 failing
0 skipped

Expand Down
3 changes: 2 additions & 1 deletion ...ces/command-outputs/windows/OptimizedExecutableTestingTest-testWithCommonDependencies.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,12 @@ Running Tests
optimized_test_run_test
[pass] importUsageTest
[pass] simpleTest
[pass] testFPCallToBuildPkgFromTestablePkg
[pass] testFn
[pass] unusedFunctionInvoker


4 passing
5 passing
0 failing
0 skipped

Expand Down
4 changes: 4 additions & 0 deletions ...-integration-test/src/test/resources/project-based-tests/optimized_test_run_test/main.bal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,7 @@ function testUsageFunction() returns RecB{
RecB recB = {name: 0};
return recB;
}

public function buildPkgFn (string a) returns string{
return "hello";
};
8 changes: 8 additions & 0 deletions ...ration-test/src/test/resources/project-based-tests/optimized_test_run_test/tests/test.bal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,11 @@ function testFn() {
function unusedFunctionInvoker(){
test:assertEquals(0, testUsageFunction().name);
}

@test:Config {}
function testFPCallToBuildPkgFromTestablePkg() {
worker StdInReader returns string {
string word = buildPkgFn("foo");
return word;
}
}

0 comments on commit 095db58

Please sign in to comment.