-
Notifications
You must be signed in to change notification settings - Fork 69
Added thermal model for hosts #238
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.
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
zohaib-c
wants to merge
12
commits into
atlarge-research:master
Choose a base branch
from
zohaib-c:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
67ad73c
Added a Resistance-Capacitance thermal model
zohaib-c 1ea1c23
Added temperature from power model
zohaib-c c002fe4
Added a test for thermal power
zohaib-c 2610e77
Added unit tests for thermal power and temperature. All tests pass.
zohaib-c 6bb5738
Refactored temperature model to a Resistance-Capacitance model
zohaib-c 53f94b8
Spotless Check
zohaib-c f24f4e3
Fixed bugs with ParquetHostDataWriter
zohaib-c bee1fc8
* Added a linear interpolation model for static current
zohaib-c 95e9166
Refactored thermal model for clarity
zohaib-c a3ac6f4
* Created a new class for the thermal models
zohaib-c a2c3c3f
* Bug Fix: static power now properly takes into account voltage
zohaib-c a46ea88
Made changes based on feedback from PR
zohaib-c File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zohaib-c marked this conversation as resolved.
Show resolved
Hide resolved
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zohaib-c marked this conversation as resolved.
Show resolved
Hide resolved
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zohaib-c marked this conversation as resolved.
Show resolved
Hide resolved
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zohaib-c marked this conversation as resolved.
Show resolved
Hide resolved
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -26,6 +26,7 @@ | |
| import org.jetbrains.annotations.NotNull; | ||
| import org.opendc.simulator.compute.model.ProcessingUnit; | ||
| import org.opendc.simulator.compute.power.CpuPowerModel; | ||
| import org.opendc.simulator.compute.thermal.ThermalModel; | ||
| import org.opendc.simulator.flow2.FlowGraph; | ||
| import org.opendc.simulator.flow2.FlowStage; | ||
| import org.opendc.simulator.flow2.FlowStageLogic; | ||
|
|
@@ -57,8 +58,8 @@ public static SimPsuFactory noop() { | |
| * | ||
| * @param model The power model to estimate the power consumption based on the CPU usage. | ||
| */ | ||
| public static SimPsuFactory simple(CpuPowerModel model) { | ||
| return (machine, graph) -> new SimplePsu(graph, model); | ||
| public static SimPsuFactory simple(CpuPowerModel model, ThermalModel thermalModel) { | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ideally, we would make the thermalModel variable nullable. |
||
| return (machine, graph) -> new SimplePsu(graph, model, thermalModel); | ||
| } | ||
|
|
||
| /** | ||
|
|
@@ -91,6 +92,14 @@ public double getEnergyUsage() { | |
| return 0; | ||
| } | ||
|
|
||
| @Override | ||
| public double getCpuTemperature() { | ||
| return 0; | ||
| } | ||
|
|
||
| @Override | ||
| public void setTemperature() {} | ||
|
|
||
| @Override | ||
| InPort getCpuPower(int id, ProcessingUnit model) { | ||
| final InPort port = stage.getInlet("cpu" + id); | ||
|
|
@@ -117,6 +126,7 @@ private static final class SimplePsu extends SimPsu implements FlowStageLogic { | |
| private final FlowStage stage; | ||
| private final OutPort out; | ||
| private final CpuPowerModel model; | ||
| private final ThermalModel thermalModel; | ||
| private final InstantSource clock; | ||
|
|
||
| private double targetFreq; | ||
|
|
@@ -125,6 +135,10 @@ private static final class SimplePsu extends SimPsu implements FlowStageLogic { | |
|
|
||
| private double powerDraw; | ||
| private double energyUsage; | ||
| private double voltage = 1.8; // FIXME implement voltage when PSU is fully implemented | ||
| private double current; // FIXME implement current when PSU is fully implemented | ||
| private double staticPower; | ||
| private double machineTemp; | ||
|
|
||
| private final InHandler handler = new InHandler() { | ||
| @Override | ||
|
|
@@ -138,10 +152,11 @@ public void onUpstreamFinish(InPort port, Throwable cause) { | |
| } | ||
| }; | ||
|
|
||
| SimplePsu(FlowGraph graph, CpuPowerModel model) { | ||
| SimplePsu(FlowGraph graph, CpuPowerModel model, ThermalModel thermalModel) { | ||
| this.stage = graph.newStage(this); | ||
| this.model = model; | ||
| this.clock = graph.getEngine().getClock(); | ||
| this.thermalModel = thermalModel; | ||
| this.out = stage.getOutlet("out"); | ||
| this.out.setMask(true); | ||
|
|
||
|
|
@@ -158,6 +173,19 @@ public double getPowerDraw() { | |
| return powerDraw; | ||
| } | ||
|
|
||
| @Override | ||
| public void setTemperature() { | ||
| double minPower = model.computePower(0.0); | ||
| double maxPower = model.computePower(1.0); | ||
|
|
||
| machineTemp = thermalModel.setTemperature(powerDraw, minPower, maxPower); | ||
| } | ||
|
|
||
| @Override | ||
| public double getCpuTemperature() { | ||
| return machineTemp; | ||
| } | ||
|
|
||
| @Override | ||
| public double getEnergyUsage() { | ||
| updateEnergyUsage(clock.millis()); | ||
|
|
@@ -188,6 +216,8 @@ public long onUpdate(FlowStage ctx, long now) { | |
| out.push((float) usage); | ||
| powerDraw = usage; | ||
|
|
||
| setTemperature(); | ||
|
|
||
| return Long.MAX_VALUE; | ||
| } | ||
|
|
||
|
|
||
28 changes: 28 additions & 0 deletions
28
...dc-simulator-compute/src/main/java/org/opendc/simulator/compute/thermal/ThermalModel.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| /* | ||
| * Copyright (c) 2024 AtLarge Research | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in all | ||
| * copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| * SOFTWARE. | ||
| */ | ||
|
|
||
| package org.opendc.simulator.compute.thermal; | ||
|
|
||
| public interface ThermalModel { | ||
|
|
||
| double setTemperature(double dynamicPower, double minPower, double maxPower); | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.