8000 simplify PR 1640 by bjjwwang · Pull Request #1645 · SVF-tools/SVF · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

simplify PR 1640 #1645

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

Jump to bottom
Merged
merged 11 commits into from
Jan 31, 2025
Merged

simplify PR 1640 #1645

merged 11 commits into from
Jan 31, 2025

Conversation

bjjwwang
Copy link
Contributor

No description provided.

@codecov Codecov
Copy link
codecov bot commented Jan 31, 2025 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 63.84%. Comparing base (397afbe) to head (05c7434).
Report is 1 commits behind head on master.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1645      +/-   ##
==========================================
- Coverage   63.84%   63.84%   -0.01%     
==========================================
  Files         246      246              
  Lines       25997    25993       -4     
  Branches     4507     4507              
==========================================
- Hits        16598    16594       -4     
  Misses       9399     9399
Files with missing lines Coverage Δ
svf/include/Graphs/SCC.h 89.15% <100.00%> (+0.26%) ⬆️
svf/include/MSSA/MemRegion.h 87.50% <ø> (ø)
svf/include/WPA/WPAFSSolver.h 100.00% <100.00%> (ø)
svf/lib/MSSA/MemRegion.cpp 70.00% <100.00%> (-0.59%) ⬇️
svf/lib/WPA/Andersen.cpp 94.07% <100.00%> (-0.02%) ⬇️

@bjjwwang
Copy link
Contributor Author

--- base.log 2025-01-31 17:27:01.030543817 +1100
+++ refactor3.log 2025-01-31 17:27:24.489438076 +1100
@@ -32,9 +32,9 @@
VarArrayObj 831
VarStructObj 1663
----------------Time and memory stats--------------------
-LLVMIRTime 4.325
-SVFIRTime 3.168
-SymbolTableTime 0.6
+LLVMIRTime 4.25
+SVFIRTime 3.134
+SymbolTableTime 0.606
#######################################################

PTACallGraph Stats (Andersen analysis)******
@@ -57,15 +57,15 @@
AvgIn/OutLoadEdge 0.146529
AvgIn/OutStoreEdge 0.145848
AvgPtsSetSize 168.723
-AvgTopLvlPtsSize 538.417
+AvgTopLvlPtsSize 538.414
CollapseTime 0
CopyGepTime 0
LoadStoreTime 0
-MemoryUsageVmrss 4.1707e+06
-MemoryUsageVmsize 4.1706e+06
+MemoryUsageVmrss 4.17068e+06
+MemoryUsageVmsize 4.17065e+06
SCCDetectTime 0
SCCMergeTime 0
-TotalTime 124.997
+TotalTime 124.192
UpdateCGTime 0
----------------Numbers stats----------------------------
AddrProcessed 17879
@@ -116,32 +116,32 @@
Persistent Points-To Cache Statistics: Andersen's analysis bitvector
################ (program : redis-server.bc)###############
UniquePointsToSets 44826
-TotalUnions 672567
+TotalUnions 672568
PropertyUnions 222172
UniqueUnions 19257
LookupUnions 395149
-PreemptiveUnions 35989
+PreemptiveUnions 35990
TotalComplements 3363830
PropertyComplements 2998252
UniqueComplements 16887
LookupComplements 331806
PreemptiveComplements 16885
-TotalIntersections 4182715
-PropertyIntersections 4145377
-UniqueIntersections 846
-LookupIntersections 2195
-PreemptiveIntersections 34297
+TotalIntersections 4182716
+PropertyIntersections 4145411
+UniqueIntersections 844
+LookupIntersections 2163
+PreemptiveIntersections 34298
#######################################################

Memory SSA Statistics******
################ (program : redis-server.bc)###############
----------------Time and memory stats--------------------
AverageRegSize 85.8766
-GenMUCHITime 1.932
-GenRegionTime 628.799
-InsertPHITime 0.594
-SSARenameTime 0.078
-TotalMSSATime 631.412
+GenMUCHITime 1.981
+GenRegionTime 611.905
+InsertPHITime 0.612
+SSARenameTime 0.095
+TotalMSSATime 614.6
----------------Numbers stats----------------------------
BBHasMSSAPhi 10656
CSChiNode 110781
@@ -164,13 +164,13 @@
SVFG Statistics******
################ (program : redis-server.bc)###############
----------------Time and memory stats--------------------
-ATNodeTime 0.857
+ATNodeTime 0.884
AvgWeight 168.485
ConnDirEdgeTime 0
-ConnIndEdgeTime 4.567
+ConnIndEdgeTime 4.62
OptTime 0
TLNodeTime 0
-TotalTime 5.424
+TotalTime 5.504
----------------Numbers stats----------------------------
ActualIn 162728
ActualOut 110781
@@ -225,27 +225,27 @@
AddrTime 0
AverageSCCSize 19.105
AvgPtsSize 67.7949
-AvgTopLvlPtsSize 370.002
+AvgTopLvlPtsSize 370
AvgVersionPtsSize 32.3067
CopyTime 0
DirectPropaTime 0
GepTime 0
IndirectPropaTime 0
LoadTime 0
-MemoryUsageVmrss 3.62211e+06
-MemoryUsageVmsize 3.65487e+06
+MemoryUsageVmrss 3.66512e+06
+MemoryUsageVmsize 3.69664e+06
PhiTime 0
-PrelabelingTime 0.149
+PrelabelingTime 0.155
ProcessTime 0
PropagationTime 0
SCCTime 0
-SolveTime 460.297
+SolveTime 485.561
StoreTime 0
Strong/WeakUpdTime 0
-TotalTime 680.823
+TotalTime 702.39
UpdateCGTime 0
VersionPropTime 0
-meldLabelingTime 216.937
+meldLabelingTime 213.396
----------------Numbers stats----------------------------
CopysNum 14138
DummyFieldPtrs 2305
@@ -263,13 +263,13 @@
Pointers 535314
ProcessedAParam 0
ProcessedAddr 107274
-ProcessedCopy 159673
+ProcessedCopy 186859
ProcessedFRet 0
-ProcessedGep 855965
-ProcessedLoad 889677
+ProcessedGep 1056674
+ProcessedLoad 1018118
ProcessedMSSANode 2282010
-ProcessedPhi 103525
-ProcessedStore 324605
+ProcessedPhi 129162
+ProcessedStore 427999
SolveIterations 6
StoresNum 24163
StrongUpdates 3377
@@ -284,12 +284,12 @@

Persistent Points-To Cache Statistics: flow-sensitive analysis bitvector
################ (program : redis-server.bc)###############
-UniquePointsToSets 29197
-TotalUnions 1172442204
-PropertyUnions 1023700164
-UniqueUnions 36054
-LookupUnions 148657295
-PreemptiveUnions 48691
+UniquePointsToSets 29260
+TotalUnions 1340169250
+PropertyUnions 1177167661
+UniqueUnions 36073
+LookupUnions 162916672
+PreemptiveUnions 48844
TotalComplements 0
PropertyComplements 0
UniqueComplements 0

@bjjwwang
Copy link
Contributor Author

--- base.log 2025-01-31 17:27:01.030543817 +1100
+++ refactor4.log 2025-01-31 18:08:02.553687653 +1100
@@ -32,9 +32,9 @@
VarArrayObj 831
VarStructObj 1663
----------------Time and memory stats--------------------
-LLVMIRTime 4.325
-SVFIRTime 3.168
-SymbolTableTime 0.6
+LLVMIRTime 4.291
+SVFIRTime 3.171
+SymbolTableTime 0.591
#######################################################

PTACallGraph Stats (Andersen analysis)******
@@ -57,15 +57,15 @@
AvgIn/OutLoadEdge 0.146529
AvgIn/OutStoreEdge 0.145848
AvgPtsSetSize 168.723
-AvgTopLvlPtsSize 538.417
+AvgTopLvlPtsSize 538.414
CollapseTime 0
CopyGepTime 0
LoadStoreTime 0
-MemoryUsageVmrss 4.1707e+06
+MemoryUsageVmrss 4.17072e+06
MemoryUsageVmsize 4.1706e+06
SCCDetectTime 0
SCCMergeTime 0
-TotalTime 124.997
+TotalTime 125.195
UpdateCGTime 0
----------------Numbers stats----------------------------
AddrProcessed 17879
@@ -116,47 +116,47 @@
Persistent Points-To Cache Statistics: Andersen's analysis bitvector
################ (program : redis-server.bc)###############
UniquePointsToSets 44826
-TotalUnions 672567
+TotalUnions 672556
PropertyUnions 222172
-UniqueUnions 19257
-LookupUnions 395149
-PreemptiveUnions 35989
+UniqueUnions 19258
+LookupUnions 395148
+PreemptiveUnions 35978
TotalComplements 3363830
PropertyComplements 2998252
UniqueComplements 16887
LookupComplements 331806
PreemptiveComplements 16885
-TotalIntersections 4182715
-PropertyIntersections 4145377
-UniqueIntersections 846
-LookupIntersections 2195
-PreemptiveIntersections 34297
+TotalIntersections 4182703
+PropertyIntersections 4145448
+UniqueIntersections 831
+LookupIntersections 2139
+PreemptiveIntersections 34285
#######################################################

Memory SSA Statistics******
################ (program : redis-server.bc)###############
----------------Time and memory stats--------------- 8000 -----
-AverageRegSize 85.8766
-GenMUCHITime 1.932
-GenRegionTime 628.799
-InsertPHITime 0.594
-SSARenameTime 0.078
-TotalMSSATime 631.412
+AverageRegSize 85.1068
+GenMUCHITime 1.957
+GenRegionTime 618.125
+InsertPHITime 0.617
+SSARenameTime 0.114
+TotalMSSATime 620.818
----------------Numbers stats----------------------------
BBHasMSSAPhi 10656
-CSChiNode 110781
+CSChiNode 112311
CSHasChi 22214
CSHasMu 24084
-CSMuNode 162728
-FunEntryChi 24040
+CSMuNode 164973
+FunEntryChi 24354
FunHasEntryChi 3939
FunHasRetMu 4624
-FunRetMu 23972
+FunRetMu 24286
LoadHasMu 24342
LoadMuNode 43107
-MSSAPhi 58814
+MSSAPhi 60005
MaxRegSize 1650
-MemRegions 4530
+MemRegions 4577
StoreChiNode 14268
StoreHasChi 10506
#######################################################
@@ -164,16 +164,16 @@
SVFG Statistics******
################ (program : redis-server.bc)###############
----------------Time and memory stats--------------------
-ATNodeTime 0.857
-AvgWeight 168.485
+ATNodeTime 0.868
+AvgWeight 166.059
ConnDirEdgeTime 0
-ConnIndEdgeTime 4.567
+ConnIndEdgeTime 4.592
OptTime 0
TLNodeTime 0
-TotalTime 5.424
+TotalTime 5.46
----------------Numbers stats----------------------------
-ActualIn 162728
-ActualOut 110781
+ActualIn 164973
+ActualOut 112311
ActualParam 57426
ActualRet 7530
Addr 17879
@@ -185,25 +185,25 @@
DirectCallEdge 41433
DirectEdge 292410
DirectRetEdge 6892
-FormalIn 24040
-FormalOut 23972
+FormalIn 24354
+FormalOut 24286
FormalParam 7868
FormalRet 789
Gep 84876
-IndCallEdge 189539
-IndRetEdge 124212
-IndirectEdge 714061
-IndirectEdgeLabels 120308915
+IndCallEdge 192393
+IndRetEdge 126097
+IndirectEdge 724424
+IndirectEdgeLabels 120297479
Load 24342
-MSSAPhi 58814
+MSSAPhi 60005
MaxInDegree 9710
MaxIndInDeg 9710
MaxIndOutDeg 2458
MaxOutDegree 9600
PHI 6770
Store 24163
-TotalEdge 1006471
-TotalNode 626117
+TotalEdge 1016834
+TotalNode 631711
#######################################################

PTACallGraph Stats (Flow-sensitive analysis)******
@@ -224,28 +224,28 @@
----------------Time and memory stats--------------------
AddrTime 0
AverageSCCSize 19.105
-AvgPtsSize 67.7949
-AvgTopLvlPtsSize 370.002
-AvgVersionPtsSize 32.3067
+AvgPtsSize 67.7968
+AvgTopLvlPtsSize 370
+AvgVersionPtsSize 32.3076
CopyTime 0
DirectPropaTime 0
GepTime 0
IndirectPropaTime 0
LoadTime 0
-MemoryUsageVmrss 3.62211e+06
-MemoryUsageVmsize 3.65487e+06
+MemoryUsageVmrss 3.6613e+06
+MemoryUsageVmsize 3.69747e+06
PhiTime 0
-PrelabelingTime 0.149
+PrelabelingTime 0.137
ProcessTime 0
PropagationTime 0
SCCTime 0
-SolveTime 460.297
+SolveTime 521.529
StoreTime 0
Strong/WeakUpdTime 0
-TotalTime 680.823
+TotalTime 740.451
UpdateCGTime 0
VersionPropTime 0
-meldLabelingTime 216.937
+meldLabelingTime 215.486
----------------Numbers stats----------------------------
CopysNum 14138
DummyFieldPtrs 2305
@@ -263,33 +263,33 @@
Pointers 535314
ProcessedAParam 0
ProcessedAddr 107274
-ProcessedCopy 159673
+ProcessedCopy 186930
ProcessedFRet 0
-ProcessedGep 855965
-ProcessedLoad 889677
-ProcessedMSSANode 2282010
-ProcessedPhi 103525
-ProcessedStore 324605
+ProcessedGep 1058393
+ProcessedLoad 1024507
+ProcessedMSSANode 2315574
+ProcessedPhi 129063
+ProcessedStore 427672
SolveIterations 6
StoresNum 24163
StrongUpdates 3377
TotalEmptyVPts 0
-TotalExistingVPts 15080536
-TotalNonEmptyVPts 15080536
+TotalExistingVPts 15080079
+TotalNonEmptyVPts 15080079
TotalObjects 15706
TotalPointers 535314
TotalSingleVObjs 0
-TotalVersions 17442434
+TotalVersions 17441641
#######################################################

Persistent Points-To Cache Statistics: flow-sensitive analysis bitvector
################ (program : redis-server.bc)###############
-UniquePointsToSets 29197
-TotalUnions 1172442204
-PropertyUnions 1023700164
-UniqueUnions 36054
-LookupUnions 148657295
-PreemptiveUnions 48691
+UniquePointsToSets 29290
+TotalUnions 1349826950
+PropertyUnions 1183306925
+UniqueUnions 36204
+LookupUnions 166434837
+PreemptiveUnions 48984
TotalComplements 0
PropertyComplements 0
UniqueComplements 0

@bjjwwang
Copy link
Contributor Author

--- base.log 2025-01-31 17:27:01.030543817 +1100
+++ refactor5.log 2025-01-31 18:52:30.490830717 +1100
@@ -32,9 +32,9 @@
VarArrayObj 831
VarStructObj 1663
----------------Time and memory stats--------------------
-LLVMIRTime 4.325
-SVFIRTime 3.168
-SymbolTableTime 0.6
+LLVMIRTime 4.274
+SVFIRTime 3.156
+SymbolTableTime 0.606
#######################################################

PTACallGraph Stats (Andersen analysis)******
@@ -57,15 +57,15 @@
AvgIn/OutLoadEdge 0.146529
AvgIn/OutStoreEdge 0.145848
AvgPtsSetSize 168.723
-AvgTopLvlPtsSize 538.417
+AvgTopLvlPtsSize 538.414
CollapseTime 0
CopyGepTime 0
LoadStoreTime 0
-MemoryUsageVmrss 4.1707e+06
+MemoryUsageVmrss 4.17084e+06
MemoryUsageVmsize 4.1706e+06
SCCDetectTime 0
SCCMergeTime 0
-TotalTime 124.997
+TotalTime 125.366
UpdateCGTime 0
----------------Numbers stats----------------------------
AddrProcessed 17879
@@ -116,47 +116,47 @@
Persistent Points-To Cache Statistics: Andersen's analysis bitvector
################ (program : redis-server.bc)###############
UniquePointsToSets 44826
-TotalUnions 672567
+TotalUnions 672566
PropertyUnions 222172
UniqueUnions 19257
LookupUnions 395149
-PreemptiveUnions 35989
+PreemptiveUnions 35988
TotalComplements 3363830
PropertyComplements 2998252
UniqueComplements 16887
LookupComplements 331806
PreemptiveComplements 16885
-TotalIntersections 4182715
-PropertyIntersections 4145377
-UniqueIntersections 846
-LookupIntersections 2195
-PreemptiveIntersections 34297
+TotalIntersections 4182714
+PropertyIntersections 4145389
+UniqueIntersections 850
+LookupIntersections 2179
+PreemptiveIntersections 34296
#######################################################

Memory SSA Statistics******
################ (program : redis-server.bc)###############
----------------Time and memory stats--------------------
-AverageRegSize 85.8766
-GenMUCHITime 1.932
-GenRegionTime 628.799
-InsertPHITime 0.594
-SSARenameTime 0.078
-TotalMSSATime 631.412
+AverageRegSize 85.6225
+GenMUCHITime 2.004
+GenRegionTime 609.83
+InsertPHITime 0.622
+SSARenameTime 0.092
+TotalMSSATime 612.556
----------------Numbers stats----------------------------
BBHasMSSAPhi 10656
-CSChiNode 110781
+CSChiNode 111620
CSHasChi 22214
CSHasMu 24084
-CSMuNode 162728
-FunEntryChi 24040
+CSMuNode 163704
+FunEntryChi 24189
FunHasEntryChi 3939
FunHasRetMu 4624
-FunRetMu 23972
+FunRetMu 24121
LoadHasMu 24342
LoadMuNode 43107
-MSSAPhi 58814
+MSSAPhi 59492
MaxRegSize 1650
-MemRegions 4530
+MemRegions 4548
StoreChiNode 14268
StoreHasChi 10506
#######################################################
@@ -164,16 +164,16 @@
SVFG Statistics******
################ (program : redis-server.bc)###############
----------------Time and memory stats--------------------
-ATNodeTime 0.857
-AvgWeight 168.485
+ATNodeTime 0.86
+AvgWeight 167.292
ConnDirEdgeTime 0
-ConnIndEdgeTime 4.567
+ConnIndEdgeTime 4.585
OptTime 0
TLNodeTime 0
-TotalTime 5.424
+TotalTime 5.445
----------------Numbers stats----------------------------
-ActualIn 162728
-ActualOut 110781
+ActualIn 163704
+ActualOut 111620
ActualParam 57426
ActualRet 7530
Addr 17879
@@ -185,25 +185,25 @@
DirectCallEdge 41433
DirectEdge 292410
DirectRetEdge 6892
-FormalIn 24040
-FormalOut 23972
+FormalIn 24189
+FormalOut 24121
FormalParam 7868
FormalRet 789
Gep 84876
-IndCallEdge 189539
-IndRetEdge 124212
-IndirectEdge 714061
-IndirectEdgeLabels 120308915
+IndCallEdge 190756
+IndRetEdge 125220
+IndirectEdge 719141
+IndirectEdgeLabels 120306269
Load 24342
-MSSAPhi 58814
+MSSAPhi 59492
MaxInDegree 9710
MaxIndInDeg 9710
MaxIndOutDeg 2458
MaxOutDegree 9600
PHI 6770
Store 24163
-TotalEdge 1006471
-TotalNode 626117
+TotalEdge 1011551
+TotalNode 628908
#######################################################

PTACallGraph Stats (Flow-sensitive analysis)******
@@ -225,27 +225,27 @@
AddrTime 0
AverageSCCSize 19.105
AvgPtsSize 67.7949
-AvgTopLvlPtsSize 370.002
+AvgTopLvlPtsSize 370
AvgVersionPtsSize 32.3067
CopyTime 0
DirectPropaTime 0
GepTime 0
IndirectPropaTime 0
LoadTime 0
-MemoryUsageVmrss 3.62211e+06
-MemoryUsageVmsize 3.65487e+06
+MemoryUsageVmrss 3.66048e+06
+MemoryUsageVmsize 3.6927e+06
PhiTime 0
-PrelabelingTime 0.149
+PrelabelingTime 0.138
ProcessTime 0
PropagationTime 0
SCCTime 0
-SolveTime 460.297
+SolveTime 476.952
StoreTime 0
Strong/WeakUpdTime 0
-TotalTime 680.823
+TotalTime 701.153
UpdateCGTime 0
VersionPropTime 0
-meldLabelingTime 216.937
+meldLabelingTime 220.831
----------------Numbers stats----------------------------
CopysNum 14138
DummyFieldPtrs 2305
@@ -263,33 +263,33 @@
Pointers 535314
ProcessedAParam 0
ProcessedAddr 107274
-ProcessedCopy 159673
+ProcessedCopy 184900
ProcessedFRet 0
-ProcessedGep 855965
-ProcessedLoad 889677
-ProcessedMSSANode 2282010
-ProcessedPhi 103525
-ProcessedStore 324605
+ProcessedGep 1051917
+ProcessedLoad 1021153
+ProcessedMSSANode 2298756
+ProcessedPhi 128277
+ProcessedStore 425425
SolveIterations 6
StoresNum 24163
StrongUpdates 3377
TotalEmptyVPts 0
-TotalExistingVPts 15080536
-TotalNonEmptyVPts 15080536
+TotalExistingVPts 15080515
+TotalNonEmptyVPts 15080515
TotalObjects 15706
TotalPointers 535314
TotalSingleVObjs 0
-TotalVersions 17442434
+TotalVersions 17442341
#######################################################

Persistent Points-To Cache Statistics: flow-sensitive analysis bitvector
################ (program : redis-server.bc)###############
-UniquePointsToSets 29197
-TotalUnions 1172442204
-PropertyUnions 1023700164
-UniqueUnions 36054
-LookupUnions 148657295
-PreemptiveUnions 48691
+UniquePointsToSets 29115
+TotalUnions 1336754713
+PropertyUnions 1180627565
+UniqueUnions 35692
+LookupUnions 156043067
+PreemptiveUnions 48389
TotalComplements 0
PropertyComplements 0
UniqueComplements 0

@yuleisui yuleisui merged commit ab71cdd into SVF-tools:master Jan 31, 2025
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@bjjwwang @yuleisui @canliture
0