Skip to content

Small performance enhancements #4267

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
merged 3 commits into from
Apr 6, 2018
Merged

Small performance enhancements #4267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b7e51db
Do not initialize the Simplifier if it will not transform
nicolasstucki Apr 6, 2018
686292a
Avoid computing set of value classes getClass methods
nicolasstucki Apr 6, 2018
39de3a5
Remove ScalaValueClasses cache
nicolasstucki Apr 6, 2018
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
10 changes: 1 addition & 9 deletions compiler/src/dotty/tools/dotc/transform/InterceptedMethods.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,6 @@ class InterceptedMethods extends MiniPhase {

override def phaseName: String = InterceptedMethods.name

private[this] var primitiveGetClassMethods: Set[Symbol] = _

/** perform context-dependant initialization */
override def prepareForUnit(tree: Tree)(implicit ctx: Context) = {
primitiveGetClassMethods = Set[Symbol]() ++ defn.ScalaValueClasses().map(x => x.requiredMethod(nme.getClass_))
ctx
}

// this should be removed if we have guarantee that ## will get Apply node
override def transformSelect(tree: tpd.Select)(implicit ctx: Context): Tree = {
if (tree.symbol.isTerm && (defn.Any_## eq tree.symbol.asTerm)) {
Expand Down Expand Up @@ -105,7 +97,7 @@ class InterceptedMethods extends MiniPhase {
List(qual, typer.resolveClassTag(tree.pos, qual.tpe.widen))))
}*/
*/
case t if primitiveGetClassMethods.contains(t) =>
case t if t.name == nme.getClass_ && defn.ScalaValueClasses().contains(t.owner) =>
// if we got here then we're trying to send a primitive getClass method to either
// a) an Any, in which cage Object_getClass works because Any erases to object. Or
//
Expand Down
24 changes: 13 additions & 11 deletions compiler/src/dotty/tools/dotc/transform/localopt/Simplify.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,17 +79,19 @@ class Simplify extends MiniPhase with IdentityDenotTransformer {
var fuel: Int = -1

override def prepareForUnit(tree: Tree)(implicit ctx: Context) = {
SeqFactoryClass = ctx.requiredClass("scala.collection.generic.SeqFactory")
CommutativePrimitiveOperations = Set(defn.Boolean_&&, defn.Boolean_||, defn.Int_+, defn.Int_*, defn.Long_+, defn.Long_*)

val maxFuel = ctx.settings.YoptFuel.value
if (fuel < 0 && maxFuel > 0) // Both defaults are at -1
fuel = maxFuel

optimisations = {
val o = if (ctx.erasedTypes) afterErasure else beforeErasure
val p = ctx.settings.YoptPhases.value
if (p.isEmpty) o else o.filter(x => p.contains(x.name))
if (ctx.settings.optimise.value) {
SeqFactoryClass = ctx.requiredClass("scala.collection.generic.SeqFactory")
CommutativePrimitiveOperations = Set(defn.Boolean_&&, defn.Boolean_||, defn.Int_+, defn.Int_*, defn.Long_+, defn.Long_*)

val maxFuel = ctx.settings.YoptFuel.value
if (fuel < 0 && maxFuel > 0) // Both defaults are at -1
fuel = maxFuel

optimisations = {
val o = if (ctx.erasedTypes) afterErasure else beforeErasure
val p = ctx.settings.YoptPhases.value
if (p.isEmpty) o else o.filter(x => p.contains(x.name))
}
}

ctx
Expand Down