Commit 2778498a authored by Alexander Diewald's avatar Alexander Diewald

Merge branch '3984' into 'master'

3984

See merge request !312
parents 38a6f48a 1135c27b
HierarchicPlatformArchitectureCompositor.java fecefdbd64c391f179730ac5aea7e7265ec81fca GREEN HierarchicPlatformArchitectureCompositor.java fecefdbd64c391f179730ac5aea7e7265ec81fca GREEN
HierarchicalCompositionRules.java 70651bf28c1a455eead6556e7578c81317aa9d5c GREEN HierarchicalCompositionRules.java 2eee9812a32b4be0d4f50babfec86bd96af6ecfe GREEN
...@@ -84,6 +84,7 @@ public class HierarchicalCompositionRules extends PlatformHierarchicalCompositio ...@@ -84,6 +84,7 @@ public class HierarchicalCompositionRules extends PlatformHierarchicalCompositio
rval.add(IMemoryDomain.class); rval.add(IMemoryDomain.class);
rval.add(INocDomain.class); rval.add(INocDomain.class);
rval.add(IElectronicsDomain.class); rval.add(IElectronicsDomain.class);
rval.add(IPeripheralsDomain.class);
} else if(hasEqualLevel(domain, IMemoryDomain.class)) { } else if(hasEqualLevel(domain, IMemoryDomain.class)) {
rval.add(IProcessorDomain.class); rval.add(IProcessorDomain.class);
rval.add(ITileDomain.class); rval.add(ITileDomain.class);
...@@ -112,11 +113,14 @@ public class HierarchicalCompositionRules extends PlatformHierarchicalCompositio ...@@ -112,11 +113,14 @@ public class HierarchicalCompositionRules extends PlatformHierarchicalCompositio
public boolean isCompatibleDomains(Class<? extends IArchitectureDomain> domain1, public boolean isCompatibleDomains(Class<? extends IArchitectureDomain> domain1,
Class<? extends IArchitectureDomain> domain2) { Class<? extends IArchitectureDomain> domain2) {
boolean processorAndPeripherals = isCompatibleDomainsCommutative(domain1, domain2, // Memory
IProcessorDomain.class, IPeripheralsDomain.class);
boolean processorAndMemory = isCompatibleDomainsCommutative(domain1, domain2, boolean processorAndMemory = isCompatibleDomainsCommutative(domain1, domain2,
IProcessorDomain.class, IMemoryDomain.class); IProcessorDomain.class, IMemoryDomain.class);
// Peripherals
boolean tileAndPeripherals = isCompatibleDomainsCommutative(domain1, domain2,
ITileDomain.class, IPeripheralsDomain.class);
// Electrical supply of platform elements down to tiles. // Electrical supply of platform elements down to tiles.
boolean tileAndElectrialSupply = isCompatibleDomainsCommutative(domain1, domain2, boolean tileAndElectrialSupply = isCompatibleDomainsCommutative(domain1, domain2,
ITileDomain.class, IElectronicsDomain.class); ITileDomain.class, IElectronicsDomain.class);
...@@ -126,10 +130,13 @@ public class HierarchicalCompositionRules extends PlatformHierarchicalCompositio ...@@ -126,10 +130,13 @@ public class HierarchicalCompositionRules extends PlatformHierarchicalCompositio
IClusterDomain.class, IElectronicsDomain.class); IClusterDomain.class, IElectronicsDomain.class);
boolean memoryAndElectrialSupply = isCompatibleDomainsCommutative(domain1, domain2, boolean memoryAndElectrialSupply = isCompatibleDomainsCommutative(domain1, domain2,
IMemoryDomain.class, IElectronicsDomain.class); IMemoryDomain.class, IElectronicsDomain.class);
boolean electricalSupply = tileAndElectrialSupply || nodeAndElectrialSupply || boolean peripheralsAndElectrialSupply = isCompatibleDomainsCommutative(domain1, domain2,
clusterAndElectrialSupply || memoryAndElectrialSupply; IPeripheralsDomain.class, IElectronicsDomain.class);
boolean electricalSupply =
tileAndElectrialSupply || nodeAndElectrialSupply || clusterAndElectrialSupply ||
memoryAndElectrialSupply || peripheralsAndElectrialSupply;
return processorAndPeripherals || processorAndMemory || electricalSupply || return tileAndPeripherals || processorAndMemory || electricalSupply ||
super.isCompatibleDomains(domain1, domain2); super.isCompatibleDomains(domain1, domain2);
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment