6502
/
kickc
mirror of https://gitlab.com/camelot/kickc.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Implemented usage sorting and a file details logging option.

This commit is contained in:
jespergravgaard 2017-12-31 00:15:23 +01:00
parent be37a45e36
commit 269c1343ed
2 changed files with 40 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/main/java/dk/camelot64/kickc/fragment/AsmFragmentUsages.java
View File

@ -33,7 +33,7 @@ public class AsmFragmentUsages {
*
* @param log The compile log to add the output to
*/
public static void logUsages(CompileLog log, boolean logRedundantFiles, boolean logUnusedFiles, boolean logDetails) {
public static void logUsages(CompileLog log, boolean logRedundantFiles, boolean logUnusedFiles, boolean logFileDetails, boolean logAllDetails) {
Map<String, List<AsmFragmentTemplate>> fragmentTemplateCache = AsmFragmentManager.getFragmentTemplateCache();
ArrayList<String> signatures = new ArrayList<>(fragmentTemplateCache.keySet());
@ -132,22 +132,54 @@ public class AsmFragmentUsages {
}
}
if (logDetails) {
log.append("\nDETAILED ASM FRAGMENT USAGES");
if (logFileDetails) {
log.append("\nDETAILED ASM FILE USAGES");
// Find all file templates
List<AsmFragmentTemplate> fileTemplates = new ArrayList<>();
for (String signature : signatures) {
List<AsmFragmentTemplate> templates = fragmentTemplateCache.get(signature);
for (AsmFragmentTemplate template : templates) {
Integer usage = fragmentTemplateUsage.get(template);
if (usage == null) usage = 0;
log.append(String.format("%8d", usage) + " " + template.getName());
if (template.isFile()) {
fileTemplates.add(template);
}
}
}
logTemplatesByUsage(log, fileTemplates);
}
if (logAllDetails) {
log.append("\nDETAILED ASM FRAGMENT USAGES");
List<AsmFragmentTemplate> allTemplates = new ArrayList<>();
for (String signature : signatures) {
List<AsmFragmentTemplate> templates = fragmentTemplateCache.get(signature);
for (AsmFragmentTemplate template : templates) {
allTemplates.add(template);
}
}
logTemplatesByUsage(log, allTemplates);
}
}
private static void logTemplatesByUsage(CompileLog log, List<AsmFragmentTemplate> fileTemplates) {
// Sort by usage
Collections.sort(fileTemplates, (o1, o2) -> {
Integer u1 = fragmentTemplateUsage.get(o1);
Integer u2 = fragmentTemplateUsage.get(o2);
if (u1 == null) u1 = 0;
if (u2 == null) u2 = 0;
return u2 - u1;
}
);
// Output
for (AsmFragmentTemplate template : fileTemplates) {
Integer usage = fragmentTemplateUsage.get(template);
if (usage == null) usage = 0;
log.append(String.format("%8d", usage) + " " + (template.isFile()?"*":"")+template.getName());
}
}
}

2
src/test/java/dk/camelot64/kickc/test/TestPrograms.java
View File

@ -32,7 +32,7 @@ public class TestPrograms {
public static void tearDown() throws Exception {
CompileLog log = new CompileLog();
log.setSysOut(true);
AsmFragmentUsages.logUsages(log, true, false, false);
AsmFragmentUsages.logUsages(log, true, false, true, false);
}
@Test