6502/millfork
1
0
Fork 0
mirror of https://github.com/KarolS/millfork.git synced 2025-01-27 11:30:19 +00:00
Code Issues Projects Releases Wiki Activity

Don't require -Os for code deduplication

Browse Source
This commit is contained in:
Karol Stasiak 2019-06-24 15:17:35 +02:00
parent 23b4b110a6
commit 15475b6886
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/scala/millfork/output/Deduplicate.scala
View File

@ -49,20 +49,23 @@ abstract class Deduplicate[T <: AbstractCode](env: Environment, options: Compila
} }
def extractCommonCode(segmentName: String, segContents: Map[String, Either[String, CodeAndAlignment[T]]]): Seq[(String, CompiledFunction[T])] = { def extractCommonCode(segmentName: String, segContents: Map[String, Either[String, CodeAndAlignment[T]]]): Seq[(String, CompiledFunction[T])] = {
val minSnippetSize =
if (options.flag(CompilationFlag.OptimizeForSize)) 4
else if (options.flag(CompilationFlag.OptimizeForSonicSpeed)) 16
else if (options.flag(CompilationFlag.OptimizeForSpeed)) 13
else 10
var result = ListBuffer[(String, CompiledFunction[T])]() var result = ListBuffer[(String, CompiledFunction[T])]()
val snippets: Seq[(List[T], CodeChunk[T])] = segContents.toSeq.flatMap { val snippets: Seq[(List[T], CodeChunk[T])] = segContents.toSeq.flatMap {
case (_, Left(_)) => Nil case (_, Left(_)) => Nil
case (functionName, Right(CodeAndAlignment(code, _))) => case (functionName, Right(CodeAndAlignment(code, _))) =>
if (options.flag(CompilationFlag.OptimizeForSize)) { getExtractableSnippets(functionName, code).filter(_.codeSizeInBytes.>=(minSnippetSize)).map(code -> _)
getExtractableSnippets(functionName, code).map(code -> _)
} else Nil
} }
val chunks: Seq[CodeChunk[T]] = snippets.flatMap { case (wholeCode, snippet) => val chunks: Seq[CodeChunk[T]] = snippets.flatMap { case (wholeCode, snippet) =>
for { for {
start <- snippet.code.indices start <- snippet.code.indices
end <- start + 1 to snippet.code.length end <- start + 1 to snippet.code.length
} yield wholeCode -> CodeChunk(snippet.functionName, snippet.offset + start, snippet.offset + end)(snippet.code.slice(start, end)) } yield wholeCode -> CodeChunk(snippet.functionName, snippet.offset + start, snippet.offset + end)(snippet.code.slice(start, end))
}.map(_._2).filter(_.codeSizeInBytes > 3).groupBy { chunk => }.map(_._2).filter(_.codeSizeInBytes >= minSnippetSize).groupBy { chunk =>
renumerateLabels(chunk.code, temporary = true) renumerateLabels(chunk.code, temporary = true)
}.filter { }.filter {
case (code, _) => case (code, _) =>
@ -113,7 +116,8 @@ abstract class Deduplicate[T <: AbstractCode](env: Environment, options: Compila
val toRemove = allAffectedFunctions.map(_ -> mutable.Set[Int]()).toMap val toRemove = allAffectedFunctions.map(_ -> mutable.Set[Int]()).toMap
val toReplace = allAffectedFunctions.map(_ -> mutable.Map[Int, String]()).toMap val toReplace = allAffectedFunctions.map(_ -> mutable.Map[Int, String]()).toMap
if (options.log.traceEnabled){ if (options.log.traceEnabled){
options.log.debug(s"Extracted ${best._2.size} common code subroutines from ${allAffectedFunctions.size} functions, saving ${best._1} bytes") val functionNameList = if (allAffectedFunctions.size < 7) allAffectedFunctions.mkString(" (", ",", ")") else ""
options.log.debug(s"Extracted ${best._2.size} common code subroutines from ${allAffectedFunctions.size} functions$functionNameList, saving ${best._1} bytes")
} }
for((code, instances) <- best._2) { for((code, instances) <- best._2) {
val newName = env.nextLabel("xc") val newName = env.nextLabel("xc")