diff options
author | Daniel Lezcano <daniel.lezcano@linaro.org> | 2015-10-02 13:45:42 +0200 |
---|---|---|
committer | Daniel Lezcano <daniel.lezcano@linaro.org> | 2015-10-02 13:45:42 +0200 |
commit | a63933a51860064a01f401ecade0efd9dbcebeef (patch) | |
tree | 0436dc911e4b4cd5dd61b34ecda0f2855fee3ec4 | |
parent | 7f66b34b938417c9f80861ac21c39d40e72852d6 (diff) |
Do some cosmetic changes
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
-rw-r--r-- | rt.py | 74 |
1 files changed, 53 insertions, 21 deletions
@@ -79,10 +79,13 @@ void main() { vec2 position = vec2(x - (1 - 1 / u_scale.x), a_position); // Find the affine transformation for the subplots. - vec2 a = vec2(1./ncols, 1./(nrows))*.9; + vec2 a = vec2(1./ncols, 1./nrows)*.8; vec2 b = vec2(-1 + 2*(a_index.x+.5) / ncols, - -1 + 2*(a_index.y+.5) / (nrows)); + -1 + 2*(a_index.y+.5) / nrows); + + //vec2 b = vec2(-1 + 2*(a_index.x+.5) / ncols, + // -1 + 2*(2 + .5)); // Apply the static subplot transformation + scaling. gl_Position = vec4(a*u_scale*position+b, 0.0, 1.0); @@ -134,7 +137,12 @@ class EnergyBoard(): e2.a57_cache - e1.a57_cache, e2.a53_cache - e1.a53_cache) def str(self, board): - string = "Board %d consumption: %.2f J\n" % (board, self.board) + if board == 0: + string = "EASv5 consumption: %.2f J\n" % self.board + elif board == 1: + string = "Vanilla consumption: %.2f J\n" % self.board + else: + string = "???? consumption: %.2f J\n" % self.board string = string + " - A57: %.2fJ, Cache: %.2fJ\n" % (self.a57, self.a57_cache) string = string + " - A53: %.2fJ, Cache: %.2fJ\n" % (self.a53, self.a53_cache) return string @@ -154,39 +162,52 @@ class Canvas(app.Canvas): self.a57_1_index = 3 self.a53_0_index = 4 self.a53_1_index = 5 + self.perc_index = 6 + self.total_index = 7 self.text_energy = [] self.text_energy.append(visuals.TextVisual('', bold=False)) self.text_energy[self.board_0_index].font_size = 12. - self.text_energy[self.board_0_index].pos = self.left_margin + 120, self.size[1] - 30 - self.text_energy[self.board_0_index].color = 'green' + self.text_energy[self.board_0_index].pos = self.left_margin + 550, self.size[1] - 30 + self.text_energy[self.board_0_index].color = 'lightgreen' self.text_energy.append(visuals.TextVisual('', bold=False)) self.text_energy[self.board_1_index].font_size = 12. - self.text_energy[self.board_1_index].pos = self.left_margin, self.size[1] - 30 + self.text_energy[self.board_1_index].pos = self.left_margin + 350, self.size[1] - 30 self.text_energy[self.board_1_index].color = 'yellow' self.text_energy.append(visuals.TextVisual('', bold=False)) self.text_energy[self.a57_0_index].font_size = 9. - self.text_energy[self.a57_0_index].pos = self.left_margin, self.size[1] - 365 - self.text_energy[self.a57_0_index].color = 'green' + self.text_energy[self.a57_0_index].pos = self.left_margin + 30, self.size[1] - 360 + self.text_energy[self.a57_0_index].color = 'lightgreen' self.text_energy.append(visuals.TextVisual('', bold=False)) self.text_energy[self.a57_1_index].font_size = 9. - self.text_energy[self.a57_1_index].pos = self.left_margin, self.size[1] - 515 + self.text_energy[self.a57_1_index].pos = self.left_margin + 30, self.size[1] - 510 self.text_energy[self.a57_1_index].color = 'yellow' self.text_energy.append(visuals.TextVisual('', bold=False)) self.text_energy[self.a53_0_index].font_size = 9. - self.text_energy[self.a53_0_index].pos = self.left_margin, self.size[1] - 65 - self.text_energy[self.a53_0_index].color = 'green' + self.text_energy[self.a53_0_index].pos = self.left_margin + 30, self.size[1] - 60 + self.text_energy[self.a53_0_index].color = 'lightgreen' self.text_energy.append(visuals.TextVisual('', bold=False)) self.text_energy[self.a53_1_index].font_size = 9. - self.text_energy[self.a53_1_index].pos = self.left_margin, self.size[1] - 215 + self.text_energy[self.a53_1_index].pos = self.left_margin + 30, self.size[1] - 210 self.text_energy[self.a53_1_index].color = 'yellow' + self.text_energy.append(visuals.TextVisual('', bold=False)) + self.text_energy[self.perc_index].font_size = 18. + self.text_energy[self.perc_index].pos = self.left_margin + 170, self.size[1] - 30 + self.text_energy[self.perc_index].color = 'white' + + self.text_energy.append(visuals.TextVisual('', bold=False)) + self.text_energy[self.total_index].font_size = 12. + self.text_energy[self.total_index].pos = self.left_margin + 10, self.size[1] - 30 + self.text_energy[self.total_index].color = 'white' + self.text_energy[self.total_index].text = 'Total consumption:' + self.tr_sys = visuals.transforms.TransformSystem(self) def EnergyInit(self): @@ -253,6 +274,8 @@ class Canvas(app.Canvas): gloo.clear() self.text_energy[self.board_0_index].draw(self.tr_sys) self.text_energy[self.board_1_index].draw(self.tr_sys) + self.text_energy[self.perc_index].draw(self.tr_sys) + self.text_energy[self.total_index].draw(self.tr_sys) self.text_energy[self.a53_0_index].draw(self.tr_sys) self.text_energy[self.a53_1_index].draw(self.tr_sys) self.text_energy[self.a57_0_index].draw(self.tr_sys) @@ -302,8 +325,8 @@ class ClientThread(threading.Thread): self.canvas.energy[0].a53 += cpu_power * 0.01 self.canvas.energy[0].a53_cache += cache_power * 0.01 self.canvas.energy[0].board += cpu_power * 0.01 + cache_power * 0.01 - self.canvas.text_energy[self.canvas.a53_0_index].text = ' A53 CPU: %.2f Joules' % self.canvas.energy[0].a53 - self.canvas.text_energy[self.canvas.board_0_index].text = '%.2f Joules' % self.canvas.energy[0].board + self.canvas.text_energy[self.canvas.a53_0_index].text = ' EASv5 / A53: %.2f Joules' % self.canvas.energy[0].a53 + self.canvas.text_energy[self.canvas.board_0_index].text = 'EASv5: %.2f Joules' % self.canvas.energy[0].board if array[0] == "A57_0": @@ -316,8 +339,8 @@ class ClientThread(threading.Thread): self.canvas.energy[0].a57 += cpu_power * 0.01 self.canvas.energy[0].a57_cache += cache_power * 0.01 self.canvas.energy[0].board += cpu_power * 0.01 + cache_power * 0.01 - self.canvas.text_energy[self.canvas.a57_0_index].text = ' A57 CPU: %.2f Joules' % self.canvas.energy[0].a57 - self.canvas.text_energy[self.canvas.board_0_index].text = '%.2f Joules' % self.canvas.energy[0].board + self.canvas.text_energy[self.canvas.a57_0_index].text = ' EASv5 / A57: %.2f Joules' % self.canvas.energy[0].a57 + self.canvas.text_energy[self.canvas.board_0_index].text = 'EASv5: %.2f Joules' % self.canvas.energy[0].board if array[0] == "A53_1": @@ -330,8 +353,8 @@ class ClientThread(threading.Thread): self.canvas.energy[1].a53 += cpu_power * 0.01 self.canvas.energy[1].a53_cache += cache_power * 0.01 self.canvas.energy[1].board += cpu_power * 0.01 + cache_power * 0.01 - self.canvas.text_energy[self.canvas.a53_1_index].text = ' A53 CPU: %.2f Joules' % self.canvas.energy[1].a53 - self.canvas.text_energy[self.canvas.board_1_index].text = '%.2f Joules' % self.canvas.energy[1].board + self.canvas.text_energy[self.canvas.a53_1_index].text = ' Mainline / A53: %.2f Joules' % self.canvas.energy[1].a53 + self.canvas.text_energy[self.canvas.board_1_index].text = 'Mainline: %.2f Joules' % self.canvas.energy[1].board if array[0] == "A57_1": @@ -344,13 +367,19 @@ class ClientThread(threading.Thread): self.canvas.energy[1].a57 += cpu_power * 0.01 self.canvas.energy[1].a57_cache += cache_power * 0.01 self.canvas.energy[1].board += cpu_power * 0.01 + cache_power * 0.01 - self.canvas.text_energy[self.canvas.a57_1_index].text = ' A57 CPU: %.2f Joules' % self.canvas.energy[1].a57 - self.canvas.text_energy[self.canvas.board_1_index].text = '%.2f Joules' % self.canvas.energy[1].board + self.canvas.text_energy[self.canvas.a57_1_index].text = ' Mainline / A57: %.2f Joules' % self.canvas.energy[1].a57 + self.canvas.text_energy[self.canvas.board_1_index].text = 'Mainline: %.2f Joules' % self.canvas.energy[1].board if not self.canvas.pause: self.canvas.program['a_position'].set_data(y.ravel().astype(np.float32)) self.canvas.update() + if self.canvas.energy[0].board: + self.canvas.text_energy[self.canvas.perc_index].text = \ + '%+.2f %%' % (((self.canvas.energy[0].board - self.canvas.energy[1].board) / + self.canvas.energy[0].board) * 100) + + def socket_handler(self, fd, condition): line = self.conn.recv(1024) if line == '': @@ -439,6 +468,9 @@ class ClientThread(threading.Thread): energy_diff1.a53, energy_diff1.a53_cache)) self.start_test = 0 + elif array[0] == "RESET": + self.canvas.EnergyInit() + def socket_accept(self, fd, condition): self.conn, addr = self.socket.accept() self.epoll.register(self.conn) @@ -462,7 +494,7 @@ class ClientThread(threading.Thread): if __name__ == '__main__': - console = Console(text_color='g', font_size=8., border_color='b') + console = Console(text_color='g', font_size=16., border_color='b') c = Canvas(console) canvas = scene.SceneCanvas(keys='interactive') grid = canvas.central_widget.add_grid() |