Skip to content

SCEst: Allow host types in SLIC compilation #143

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

Open
lken274 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

SCEst: Allow host types in SLIC compilation #143

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
3e6d574
prevent pre() from adding underscores to generated C variables for IO…
lken274 Feb 16, 2026
47e8f0c
allow handing of host types
lken274 Feb 16, 2026
54d464a
fix a bug where local signals were not correctly being identified as …
lken274 Feb 22, 2026
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
5 changes: 3 additions & 2 deletions ...c/de/cau/cs/kieler/esterel/processors/transformators/incremental/EmitTransformation.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ class EmitTransformation extends AbstractSCEstDynamicProcessor<Emit> {

override transform(Emit emit) {
var signal = emit.signal as Signal
if (emit.expression === null && signal.type != ValueType.PURE) {
val isValued = signal.type != ValueType.PURE || signal.idType !== null
if (emit.expression === null && isValued) {
throw new UnsupportedOperationException("The following signal is a valued signal.
Thus a non valued emit is invalid! " + signal.toString)
}
Expand All @@ -57,7 +58,7 @@ class EmitTransformation extends AbstractSCEstDynamicProcessor<Emit> {
val assign = createAssignment(signal.createSignalReference, expr)
emit.replace(assign)
if (emit.expression !== null) {
if (signal.type != ValueType.PURE) {
if (isValued) {
var Assignment assign2
// if no combineOperator exists, handle valued signal like Karsten Rathlev did in his master thesis
if (signal.combineOperator === null || signal.combineOperator == CombineOperator.NONE) {
Expand Down
10 changes: 7 additions & 3 deletions .../kieler/esterel/processors/transformators/incremental/LocalSignalDeclTransformation.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,18 +58,22 @@ class LocalSignalDeclTransformation extends AbstractSCEstDynamicProcessor<LocalS
var decl = createDeclaration(ValueType.BOOL, s)
voStore.update(s, "signal")
var decl2 = createDeclaration(null, null)
if (signal.type !== null) {
val isValued = signal.type != ValueType.PURE || signal.idType !== null
if (signal.type !== null || signal.idType !== null) {
scope.declarations.add(decl)
if (signal.type == ValueType.PURE) {
if (!isValued) {
signalsMap.put(signal, new NewSignals(s))
}
else {
val s_set = createSignalVariable(createFalse, null, s.name + "_set")
decl.valuedObjects.add(s_set)
val s_val = createSignalVariable(signal.initialValue, signal.combineOperator, s.name + "_val")
val s_cur = createSignalVariable(null, signal.combineOperator, s.name + "_cur")
val tempType = if (signal.type == ValueType.DOUBLE) ValueType.FLOAT else signal.type
val tempType = if (signal.idType !== null) ValueType.HOST
else if (signal.type == ValueType.DOUBLE) ValueType.FLOAT
else signal.type
decl2 = createDeclaration(tempType, null)
if (signal.idType !== null) decl2.hostType = signal.idType
decl2.valuedObjects.add(s_val)
decl2.valuedObjects.add(s_cur)
signalsMap.put(signal, new NewSignals(s, s_set, s_cur, s_val))
Expand Down
4 changes: 4 additions & 0 deletions ...rc/de/cau/cs/kieler/esterel/processors/transformators/incremental/SCLTransformation.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import de.cau.cs.kieler.scl.Module
import de.cau.cs.kieler.scl.SCLProgram
import de.cau.cs.kieler.kicool.compilation.Processor
import de.cau.cs.kieler.kicool.compilation.ProcessorType
import org.eclipse.emf.ecore.util.EcoreUtil

/**
* @author mrb
Expand Down Expand Up @@ -71,6 +72,9 @@ class SCLTransformation extends Processor<EsterelProgram, SCLProgram> {

def transform(EsterelProgram prog) {
val sclProg = createSCLProg
for (p : prog.pragmas) {
sclProg.pragmas += EcoreUtil.copy(p)
}
for (m : prog.modules.filter(Module)) {
val module = createSCLModule
sclProg.modules += module
Expand Down
22 changes: 12 additions & 10 deletions ...de/cau/cs/kieler/esterel/processors/transformators/incremental/SignalTransformation.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,18 +69,27 @@ class SignalTransformation extends AbstractSCEstDynamicProcessor<Module> {
val decl = createDeclaration(ValueType.BOOL, s)
voStore.update(s, "signal")
var decl2 = createDeclaration(null, null)
if (signal.type !== null) {
if (signal.type !== null || signal.idType !== null) {
module.declarations.add(decl)
if (signal.type == ValueType.PURE) {
if (signal.type == ValueType.PURE && signal.idType === null) {
newSignals.put(signal, new NewSignals(s))
}
else {
val s_set = createSignalVariable(createFalse, null, s.name + "_set")
decl.valuedObjects.add(s_set)
val s_cur = createSignalVariable(null, signal.combineOperator, s.name + "_cur")
val s_val = createSignalVariable(signal.initialValue, signal.combineOperator, s.name + "_val")
val tempType = if (signal.type == ValueType.DOUBLE) ValueType.FLOAT else signal.type
val tempType = if (signal.idType !== null) {
ValueType.HOST
} else if (signal.type == ValueType.DOUBLE) {
ValueType.FLOAT
} else {
signal.type
}
decl2 = createDeclaration(tempType, null)
if (signal.idType !== null) {
decl2.hostType = signal.idType
}
decl2.valuedObjects.add(s_cur)
decl2.valuedObjects.add(s_val)
newSignals.put(signal, new NewSignals(s, s_set, s_cur, s_val))
Expand Down Expand Up @@ -113,13 +122,6 @@ class SignalTransformation extends AbstractSCEstDynamicProcessor<Module> {
model.checkGotos
}

/*
* TODO only the signals with type != null will be transformed
* signals with typeID != null are not handled
* SCL doesn't allow anything else then the predefined types
* see KExt.xtext => Declaration
*/

def createParallelForSignals(Module module, HashMap<Signal, NewSignals> signalsMap) {
var necessary = false
val signals = signalsMap.keySet.iterator.toList
Expand Down
5 changes: 3 additions & 2 deletions ....kieler.scg/src/de/cau/cs/kieler/scg/processors/codegen/c/CCodeGeneratorLogicModule.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,10 +431,11 @@ class CCodeGeneratorLogicModule extends SCGCodeGeneratorModule {
reset.code.append(indentation).append(struct.getVariableName).append(struct.separator).append(name).append(" = 0;\n")

// Add the "register save" in the tick function.
prePrefix = "_"
valuedObjectPrefix = struct.getVariableName + struct.separator
prePrefix = ""
tick.code.append(indentation)
tick.code.append(struct.getVariableName).append(struct.separator).append(name).append(" = ")
tick.code.append(struct.getVariableName).append(struct.separator).append(operatorExpression.serializeHR).append(";\n")
tick.code.append(operatorExpression.subExpressions.head.serializeHR).append(";\n")
}

protected def List<Assignment> splitAssignment(Assignment assignment) {
Expand Down
4 changes: 4 additions & 0 deletions ...ieler.scl/src/de/cau/cs/kieler/scl/processors/transformators/SCLToSCGTransformation.xtend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ package de.cau.cs.kieler.scl.processors.transformators
import com.google.inject.Inject
import de.cau.cs.kieler.annotations.StringAnnotation
import de.cau.cs.kieler.annotations.extensions.AnnotationsExtensions
import de.cau.cs.kieler.annotations.extensions.PragmaExtensions
import de.cau.cs.kieler.kexpressions.Declaration
import de.cau.cs.kieler.kexpressions.Expression
import de.cau.cs.kieler.kexpressions.MethodDeclaration
Expand Down Expand Up @@ -78,6 +79,7 @@ import static de.cau.cs.kieler.scg.processors.SCGAnnotations.*
import static extension de.cau.cs.kieler.kicool.kitt.tracing.TracingEcoreUtil.*
import static extension de.cau.cs.kieler.kicool.kitt.tracing.TransformationTracing.*


/**
* SCL to SCG Transformation
*
Expand All @@ -97,6 +99,7 @@ class SCLToSCGTransformation extends Processor<SCLProgram, SCGraphs> implements
@Inject extension AnnotationsExtensions
@Inject extension SCLExtensions
@Inject extension KEffectsExtensions
@Inject extension PragmaExtensions
static val sCGFactory = ScgFactory.eINSTANCE
extension ScgFactory = ScgFactory::eINSTANCE
static val sclFactory = SCLFactory::eINSTANCE
Expand Down Expand Up @@ -149,6 +152,7 @@ class SCLToSCGTransformation extends Processor<SCLProgram, SCGraphs> implements
// Create new SCG...
val scgs = createSCGraphs
creationalTransformation(program, scgs)
program.copyPragmas(scgs)

for (module : program.modules) {
val scg = createSCGraph
Expand Down