Skip to content

Commit

Permalink
Removing references to Builtins from Compiler (#7666)
Browse files Browse the repository at this point in the history
  • Loading branch information
@JaroslavTulach
JaroslavTulach authored Aug 27, 2023
1 parent dd7ab1d commit b8edf6a
Show file tree
Hide file tree
Showing 27 changed files with 269 additions and 172 deletions.
19 changes: 18 additions & 1 deletion engine/runtime/src/main/java/org/enso/compiler/context/CompilerContext.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,23 @@
import org.enso.compiler.Cache;
import org.enso.compiler.Compiler;
import org.enso.compiler.PackageRepository;
import org.enso.compiler.Passes;
import org.enso.compiler.SerializationManager;
import org.enso.compiler.core.IR;
import org.enso.compiler.data.CompilerConfig;
import org.enso.interpreter.node.ExpressionNode;
import org.enso.interpreter.runtime.Module;
import org.enso.interpreter.runtime.scope.LocalScope;
import org.enso.interpreter.runtime.scope.ModuleScope;
import org.enso.interpreter.runtime.scope.TopLevelScope;
import org.enso.pkg.QualifiedName;
import org.enso.polyglot.CompilationStage;

/**
* Interface that encapsulate all services {@link Compiler} needs from Truffle or other environment.
* It is implemented by {@code TruffleCompilerContext}. This adds an abstraction between {@link
* Compiler} and the information it needs from the runtime. The ultimate state is to compile the
* {@link Compiler} & co. classes separately without any dependency on Truffle API.
*/
public interface CompilerContext {
boolean isIrCachingDisabled();
Expand Down Expand Up @@ -57,9 +63,20 @@ public interface CompilerContext {
void truffleRunCodegen(Source source, ModuleScope scope, CompilerConfig config, IR.Module ir);

ExpressionNode truffleRunInline(
Source source, InlineContext scope, CompilerConfig config, IR.Expression ir);
Source source, LocalScope localScope, Module module, CompilerConfig config, IR.Expression ir);

// module related

void runStubsGenerator(Module module);

boolean typeContainsValues(String name);

void initializeBuiltinsIr(
boolean irCachingEnabled,
SerializationManager serializationManager,
FreshNameSupply freshNameSupply,
Passes passes);

QualifiedName getModuleName(Module module);

CharSequence getCharacters(Module module) throws IOException;
Expand Down
10 changes: 9 additions & 1 deletion engine/runtime/src/main/java/org/enso/interpreter/EnsoLanguage.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

import org.enso.compiler.Compiler;
import org.enso.compiler.context.InlineContext;
import org.enso.compiler.context.ModuleContext;
import org.enso.compiler.data.CompilerConfig;
import org.enso.compiler.exception.CompilationAbortedException;
import org.enso.compiler.exception.UnhandledEntity;
Expand Down Expand Up @@ -250,8 +251,15 @@ protected ExecutableNode parse(InlineParsingRequest request) throws InlineParsin
true,
scala.Option.apply(new PrintStream(outputRedirect))
);
var moduleContext = new ModuleContext(
module, redirectConfigWithStrictErrors,
scala.Option.empty(),
scala.Option.empty(),
false,
scala.Option.empty()
);
var inlineContext = new InlineContext(
module,
moduleContext,
redirectConfigWithStrictErrors,
scala.Some.apply(localScope),
scala.Some.apply(false),
Expand Down
2 changes: 1 addition & 1 deletion engine/runtime/src/main/java/org/enso/interpreter/runtime/EnsoContext.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ public void initialize() {
notificationHandler);
topScope = new TopLevelScope(builtins, packageRepository);
this.compiler =
new Compiler(new TruffleCompilerContext(this), builtins, packageRepository, compilerConfig);
new Compiler(new TruffleCompilerContext(this), packageRepository, compilerConfig);

projectPackage.ifPresent(
pkg -> packageRepository.registerMainProjectPackage(pkg.libraryName(), pkg));
Expand Down
120 changes: 98 additions & 22 deletions engine/runtime/src/main/java/org/enso/interpreter/runtime/TruffleCompilerContext.java
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
package org.enso.interpreter.runtime;

import com.oracle.truffle.api.TruffleFile;
import com.oracle.truffle.api.TruffleLogger;
import com.oracle.truffle.api.source.Source;
import java.io.IOException;
import java.io.PrintStream;
import java.util.Optional;
import java.util.function.Consumer;
import java.util.logging.Level;

import org.enso.compiler.Cache;
import org.enso.compiler.Compiler;
import org.enso.compiler.PackageRepository;
import org.enso.compiler.Passes;
import org.enso.compiler.SerializationManager;
import org.enso.compiler.codegen.IrToTruffle;
import org.enso.compiler.codegen.RuntimeStubsGenerator;
import org.enso.compiler.context.CompilerContext;
import org.enso.compiler.context.InlineContext;
import org.enso.compiler.context.FreshNameSupply;
import org.enso.compiler.core.IR;
import org.enso.compiler.data.CompilerConfig;
import org.enso.interpreter.node.ExpressionNode;
Expand All @@ -25,15 +25,24 @@
import org.enso.polyglot.CompilationStage;
import org.enso.polyglot.RuntimeOptions;

import com.oracle.truffle.api.TruffleFile;
import com.oracle.truffle.api.TruffleLogger;
import com.oracle.truffle.api.source.Source;

import scala.Option;

final class TruffleCompilerContext implements CompilerContext {

private final EnsoContext context;
private final TruffleLogger compiler;
private final TruffleLogger serializationManager;
private final RuntimeStubsGenerator stubsGenerator;

TruffleCompilerContext(EnsoContext context) {
this.context = context;
this.compiler = context.getLogger(Compiler.class);
this.serializationManager = context.getLogger(SerializationManager.class);
this.stubsGenerator = new RuntimeStubsGenerator(context.getBuiltins());
}

@Override
Expand All @@ -44,9 +53,9 @@ public boolean isIrCachingDisabled() {
@Override
public boolean isUseGlobalCacheLocations() {
return context
.getEnvironment()
.getOptions()
.get(RuntimeOptions.USE_GLOBAL_IR_CACHE_LOCATION_KEY);
.getEnvironment()
.getOptions()
.get(RuntimeOptions.USE_GLOBAL_IR_CACHE_LOCATION_KEY);
}

@Override
Expand Down Expand Up @@ -110,20 +119,14 @@ public void truffleRunCodegen(Module module, CompilerConfig config) throws IOExc
}

@Override
public void truffleRunCodegen(
Source source, ModuleScope scope, CompilerConfig config, IR.Module ir) {
public void truffleRunCodegen(Source source, ModuleScope scope, CompilerConfig config, IR.Module ir) {
new IrToTruffle(context, source, scope, config).run(ir);
}

@Override
public ExpressionNode truffleRunInline(
Source source, InlineContext inlineContext, CompilerConfig config, IR.Expression ir) {
var localScope =
inlineContext.localScope().isDefined()
? inlineContext.localScope().get()
: LocalScope.root();
return new IrToTruffle(context, source, inlineContext.module().getScope(), config)
.runInline(ir, localScope, "<inline_source>");
public ExpressionNode truffleRunInline(Source source, LocalScope localScope, Module module, CompilerConfig config, IR.Expression ir) {
return new IrToTruffle(context, source, module.getScope(), config)
.runInline(ir, localScope, "<inline_source>");
}

// module related
Expand Down Expand Up @@ -181,11 +184,76 @@ public <T> Optional<T> loadCache(Cache<T, ?> cache) {

@Override
public <T> Optional<TruffleFile> saveCache(
Cache<T, ?> cache, T entry, boolean useGlobalCacheLocations) {
Cache<T, ?> cache, T entry, boolean useGlobalCacheLocations) {
return cache.save(entry, context, useGlobalCacheLocations);
}

@Override
public boolean typeContainsValues(String name) {
var type = context.getBuiltins().getBuiltinType(name);
return type != null && type.containsValues();
}

/**
* Lazy-initializes the IR for the builtins module.
*/
@Override
public void initializeBuiltinsIr(
boolean irCachingEnabled, SerializationManager serializationManager,
FreshNameSupply freshNameSupply, Passes passes
) {
var builtins = context.getBuiltins();
var builtinsModule = builtins.getModule();
if (!builtins.isIrInitialized()) {
log(
Level.FINE,
"Initialising IR for [{0}].",
builtinsModule.getName()
);

builtins.initializeBuiltinsSource();

if (irCachingEnabled) {
if (
serializationManager.deserialize(builtinsModule) instanceof Option<?> op &&
op.isDefined() &&
op.get() instanceof Boolean b && b
) {
// Ensure that builtins doesn't try and have codegen run on it.
updateModule(
builtinsModule,
u -> u.compilationStage(CompilationStage.AFTER_CODEGEN)
);
} else {
builtins.initializeBuiltinsIr(this, freshNameSupply, passes);
updateModule(
builtinsModule,
u -> u.hasCrossModuleLinks(true)
);
}
} else {
builtins.initializeBuiltinsIr(this, freshNameSupply, passes);
updateModule(
builtinsModule,
u -> u.hasCrossModuleLinks(true)
);
}

if (irCachingEnabled && !wasLoadedFromCache(builtinsModule)) {
serializationManager.serializeModule(
builtinsModule, true, true
);
}
}
}

@Override
public void runStubsGenerator(Module module) {
stubsGenerator.run(module);
}

private final class ModuleUpdater implements Updater, AutoCloseable {

private final Module module;
private IR.Module ir;
private CompilationStage stage;
Expand Down Expand Up @@ -230,10 +298,18 @@ public void invalidateCache() {

@Override
public void close() {
if (ir != null) module.unsafeSetIr(ir);
if (stage != null) module.unsafeSetCompilationStage(stage);
if (loadedFromCache != null) module.setLoadedFromCache(loadedFromCache);
if (hasCrossModuleLinks != null) module.setHasCrossModuleLinks(hasCrossModuleLinks);
if (ir != null) {
module.unsafeSetIr(ir);
}
if (stage != null) {
module.unsafeSetCompilationStage(stage);
}
if (loadedFromCache != null) {
module.setLoadedFromCache(loadedFromCache);
}
if (hasCrossModuleLinks != null) {
module.setHasCrossModuleLinks(hasCrossModuleLinks);
}
if (resetScope) {
module.ensureScopeExists();
module.getScope().reset();
Expand Down
Loading

0 comments on commit b8edf6a

Please sign in to comment.