Latest updates

forsyde · Jul 12, 2024 · c748af6 · c748af6
1 parent d7360ec
commit c748af6
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 26 deletions.
diff --git a/build.sbt b/build.sbt
@@ -106,7 +106,7 @@ lazy val common = (project in file("scala-common"))
     // name := "idesyde-scala-common",
     libraryDependencies ++= Seq(
       "com.lihaoyi"               %% "upickle"         % upickleVersion,
-      "com.github.forsyde.IDeSyDe" % "java-core" % globalIDeSyDeJavaVersion,
+      "com.github.forsyde.IDeSyDe" % "build-java-core" % globalIDeSyDeJavaVersion,
       // "com.github.forsyde.IDeSyDe" % "build-java-blueprints" % globalIDeSyDeJavaVersion,
       "org.jgrapht" % "jgrapht-core" % jgraphtVersion,
       // ("org.scala-graph" %% "graph-core" % scalaGraphVersion).cross(CrossVersion.for3Use2_13),

diff --git a/rust-common/src/lib.rs b/rust-common/src/lib.rs
@@ -1,12 +1,6 @@
 use idesyde_core::{decision_models_schemas_gen, RustEmbeddedModule};
 use models::{
-    AnalysedSDFApplication, AperiodicAsynchronousDataflow,
-    AperiodicAsynchronousDataflowToPartitionedMemoryMappableMulticore,
-    AperiodicAsynchronousDataflowToPartitionedMemoryMappableMulticoreAndPL,
-    AperiodicAsynchronousDataflowToPartitionedTiledMulticore, InstrumentedComputationTimes,
-    InstrumentedMemoryRequirements, MemoryMappableMulticoreWithPL, MemoryMappableMultiCore,
-    PartitionedMemoryMappableMulticore, PartitionedMemoryMappableMulticoreAndPL,
-    PartitionedTiledMulticore, RuntimesAndProcessors, SDFApplication, TiledMultiCore,
+    AnalysedSDFApplication, AperiodicAsynchronousDataflow, AperiodicAsynchronousDataflowToPartitionedMemoryMappableMulticore, AperiodicAsynchronousDataflowToPartitionedMemoryMappableMulticoreAndPL, AperiodicAsynchronousDataflowToPartitionedTiledMulticore, InstrumentedComputationTimes, InstrumentedMemoryRequirements, MemoryMappableMultiCore, MemoryMappableMulticoreWithPL, PartitionedMemoryMappableMulticore, PartitionedMemoryMappableMulticoreAndPL, PartitionedTiledMulticore, PeriodicWorkloadAndAperiodicAsynchronousDataflowToPartitionedMemoryMappable, RuntimesAndProcessors, SDFApplication, TiledMultiCore
 };
 use schemars::schema_for;
 use std::{collections::HashSet, sync::Arc};
@@ -41,6 +35,9 @@ pub fn make_module() -> RustEmbeddedModule {
         )),
         Arc::new(idesyde_core::MarkedIdentificationRule::DecisionModelOnlyIdentificationRule(
             irules::identify_analyzed_sdf_from_common_sdf,
+        )),
+        Arc::new(idesyde_core::MarkedIdentificationRule::DecisionModelOnlyIdentificationRule(
+            irules::identify_combined_periodic_workload_and_aad_mem_mappable,
         ))
     ])
         // .opaque_to_model(opaque_to_model_gen![
@@ -72,7 +69,8 @@ pub fn make_module() -> RustEmbeddedModule {
             PartitionedMemoryMappableMulticore,
             PartitionedMemoryMappableMulticoreAndPL,
             AperiodicAsynchronousDataflowToPartitionedMemoryMappableMulticore,
-            AperiodicAsynchronousDataflowToPartitionedMemoryMappableMulticoreAndPL
+            AperiodicAsynchronousDataflowToPartitionedMemoryMappableMulticoreAndPL,
+            PeriodicWorkloadAndAperiodicAsynchronousDataflowToPartitionedMemoryMappable
         ])
         .build()
         .expect("Failed to build common standalone identification module. Should never happen.")

diff --git a/scala-bridge-forsyde-io/src/main/scala/idesyde/forsydeio/legacy/WorkloadRules.scala b/scala-bridge-forsyde-io/src/main/scala/idesyde/forsydeio/legacy/WorkloadRules.scala
@@ -289,7 +289,7 @@ trait WorkloadRules {
                           .mapToLong(r =>
                             ForSyDeHierarchy.InstrumentedSoftwareBehaviour
                               .tryView(r)
-                              .map(_.maxSizeInBits().values().asScala.max.toLong)
+                              .map(_.maxSizeInBits().values().asScala.maxOption.map(_.toLong).getOrElse(0L))
                               .orElse(0L)
                           )
                           .sum() + lt
@@ -298,7 +298,7 @@ trait WorkloadRules {
                           .mapToLong(r =>
                             ForSyDeHierarchy.InstrumentedSoftwareBehaviour
                               .tryView(r)
-                              .map(_.maxSizeInBits().values().asScala.max.toLong)
+                              .map(_.maxSizeInBits().values().asScala.maxOption.map(_.toLong).getOrElse(0L))
                               .orElse(0L)
                           )
                           .sum()

diff --git a/...choco/src/main/scala/idesyde/choco/CanSolvePeriodicWorkloadAndSDFServersToMulticore.scala b/...choco/src/main/scala/idesyde/choco/CanSolvePeriodicWorkloadAndSDFServersToMulticore.scala
@@ -474,15 +474,15 @@ final class CanSolvePeriodicWorkloadAndSDFServersToMulticore
       )*
     )
 
-    chocoModel
-      .getSolver()
-      .plugMonitor(new IMonitorContradiction {
-        def onContradiction(cex: ContradictionException): Unit = {
-          println(cex.toString())
-          // println(chocoModel.getVars().filter(_.getName().contains("utilization")).mkString(", "))
-          println(chocoModel.getSolver().getDecisionPath().toString())
-        }
-      })
+    // chocoModel
+    //   .getSolver()
+    //   .plugMonitor(new IMonitorContradiction {
+    //     def onContradiction(cex: ContradictionException): Unit = {
+    //       println(cex.toString())
+    //       // println(chocoModel.getVars().filter(_.getName().contains("utilization")).mkString(", "))
+    //       println(chocoModel.getSolver().getDecisionPath().toString())
+    //     }
+    //   })
     (chocoModel, objs.map(o => o.getName() -> o).toMap)
   }
 
@@ -491,7 +491,6 @@ final class CanSolvePeriodicWorkloadAndSDFServersToMulticore
       solution: Solution,
       configuration: Explorer.Configuration
   ): ExplorationSolution = {
-    println("Rebulding")
     val timeValues =
       m.wcets.flatten ++ m.platform.hardware.maxTraversalTimePerBit.flatten
         .map(
@@ -518,7 +517,6 @@ final class CanSolvePeriodicWorkloadAndSDFServersToMulticore
     //     if (configuration.memoryDiscretizationFactor > Int.MaxValue) Int.MaxValue else configuration.memoryDiscretizationFactor.toInt
     //   )
     val intVars = solution.retrieveIntVars(true).asScala
-    println(intVars.filter(v => v.getName().contains("effect") || v.getName().contains("utilization")).mkString(", "))
     val tasksMemoryMapping: Vector[Int] =
       m.tasksAndSDFs.workload.processes.zipWithIndex.map((_, i) =>
         intVars
@@ -584,7 +582,6 @@ final class CanSolvePeriodicWorkloadAndSDFServersToMulticore
         )
       )
     val numMappedElements = intVars.find(_.getName() == "nUsedPEs").get
-    println("Here")
     val invThs            = intVars.filter(_.getName().startsWith("invTh"))
     val dataChannelsSlotAllocations = m.tasksAndSDFs.workload.data_channels.zipWithIndex
       .map((c, ci) =>
@@ -647,7 +644,6 @@ final class CanSolvePeriodicWorkloadAndSDFServersToMulticore
       .map((s, i) =>
         intVars.find(_.getName().startsWith("utilization(" + i + ")")).get.getLB().toDouble / 100.0
       )
-    println("Before solution")
     ExplorationSolution(
       (Map(
         "nUsedPEs" -> numMappedElements.getValue().toDouble.asInstanceOf[java.lang.Double]

diff --git a/scala-choco/src/main/scala/idesyde/choco/ChocoExplorer.scala b/scala-choco/src/main/scala/idesyde/choco/ChocoExplorer.scala
@@ -35,6 +35,7 @@ import java.util.concurrent.CopyOnWriteArraySet
 import idesyde.common.legacy.CommonModule.tryCast
 import org.chocosolver.solver.search.loop.monitors.SearchMonitorList
 import idesyde.core.OpaqueDecisionModel
+import idesyde.core.ExplorationEvent
 
 class ChocoExplorer extends Explorer:
 
@@ -290,9 +291,9 @@ class ChocoExplorer extends Explorer:
     Stream
       .generate(() => {
         if (iter.hasNext) {
-          ExplorationEvent(Some(iter.next()), false)
+          ExplorationEvent(Some(iter.next()).toJava, false)
         } else {
-          ExplorationEvent(None, true)
+          ExplorationEvent(java.util.Optional.empty(), true)
         }
       })
       .takeWhile(!_.optimalityProved)