Commit d67a14b2 authored by George Wort's avatar George Wort Committed by V8 LUCI CQ

[turbolizer] Display live ranges in portrait mode

Allow live ranges to be displayed beside the
instruction sequence in turbolizer.

Bug: v8:7327
Change-Id: Idec5130655ccc9365dd32ec6927d8615a3e5c570
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3585960
Commit-Queue: George Wort <george.wort@arm.com>
Reviewed-by: 's avatarNico Hartmann <nicohartmann@chromium.org>
Cr-Commit-Position: refs/heads/main@{#80226}
parent 750b5f37
...@@ -25,8 +25,10 @@ code is governed by a BSD-style license that can be found in the LICENSE file. ...@@ -25,8 +25,10 @@ code is governed by a BSD-style license that can be found in the LICENSE file.
<div id="resizer-ranges" class="resizer" style="visibility:hidden;"></div> <div id="resizer-ranges" class="resizer" style="visibility:hidden;"></div>
<div id="ranges" class="content" style="visibility:hidden;"></div> <div id="ranges" class="content" style="visibility:hidden;"></div>
<div id="show-hide-ranges" class="show-hide-pane" style="visibility: hidden"> <div id="show-hide-ranges" class="show-hide-pane" style="visibility: hidden">
<input id="ranges-expand" type="image" title="show ranges" src="up-arrow.png" class="button-input invisible"> <input id="ranges-expand-vert" type="image" title="show ranges" src="up-arrow.png" class="button-input invisible">
<input id="ranges-shrink" type="image" title="hide ranges" src="down-arrow.png" class="button-input"> <input id="ranges-shrink-vert" type="image" title="hide ranges" src="down-arrow.png" class="button-input">
<input id="ranges-expand-hor" type="image" title="show ranges" src="left-arrow.png" class="button-input invisible">
<input id="ranges-shrink-hor" type="image" title="hide ranges" src="right-arrow.png" class="button-input invisible">
</div> </div>
</div> </div>
<div id="resizer-right" class="resizer"></div> <div id="resizer-right" class="resizer"></div>
......
...@@ -15,8 +15,10 @@ export const DISASSEMBLY_PANE_ID = 'disassembly'; ...@@ -15,8 +15,10 @@ export const DISASSEMBLY_PANE_ID = 'disassembly';
export const DISASSEMBLY_COLLAPSE_ID = 'disassembly-shrink'; export const DISASSEMBLY_COLLAPSE_ID = 'disassembly-shrink';
export const DISASSEMBLY_EXPAND_ID = 'disassembly-expand'; export const DISASSEMBLY_EXPAND_ID = 'disassembly-expand';
export const RANGES_PANE_ID = "ranges"; export const RANGES_PANE_ID = "ranges";
export const RANGES_COLLAPSE_ID = "ranges-shrink"; export const RANGES_COLLAPSE_VERT_ID = "ranges-shrink-vert";
export const RANGES_EXPAND_ID = "ranges-expand"; export const RANGES_EXPAND_VERT_ID = "ranges-expand-vert";
export const RANGES_COLLAPSE_HOR_ID = "ranges-shrink-hor";
export const RANGES_EXPAND_HOR_ID = "ranges-expand-hor";
export const UNICODE_BLOCK = '&#9611;'; export const UNICODE_BLOCK = '&#9611;';
export const PROF_COLS = [ export const PROF_COLS = [
{ perc: 0, col: { r: 255, g: 255, b: 255 } }, { perc: 0, col: { r: 255, g: 255, b: 255 } },
......
...@@ -40,6 +40,7 @@ export class GraphMultiView extends View { ...@@ -40,6 +40,7 @@ export class GraphMultiView extends View {
} }
hide() { hide() {
this.container.className = "";
this.hideCurrentPhase(); this.hideCurrentPhase();
super.hide(); super.hide();
} }
......
...@@ -139,6 +139,75 @@ class CSSVariables { ...@@ -139,6 +139,75 @@ class CSSVariables {
} }
} }
class UserSettingsObject {
value: boolean;
resetFunction: (boolean) => void;
}
// Manages the user's setting options regarding how the grid is displayed.
class UserSettings {
static readonly SESSION_STORAGE_PREFIX = "ranges-setting-";
settings: Map<string, UserSettingsObject>;
constructor() {
this.settings = new Map<string, UserSettingsObject>();
}
addSetting(settingName: string, value: boolean, resetFunction: (boolean) => void) {
this.settings.set(settingName, {value, resetFunction});
}
getToggleElement(settingName: string, settingLabel: string) {
const toggleEl = createElement("label", "range-toggle-setting", settingLabel);
const toggleInput = createElement("input", "range-toggle-setting") as HTMLInputElement;
toggleInput.id = "range-toggle-" + settingName;
toggleInput.setAttribute("type", "checkbox");
toggleInput.oninput = () => {
toggleInput.disabled = true;
this.set(settingName, toggleInput.checked);
this.reset(settingName);
toggleInput.disabled = false;
};
toggleEl.insertBefore(toggleInput, toggleEl.firstChild);
return toggleEl;
}
reset(settingName: string) {
const settingObject = this.settings.get(settingName);
window.sessionStorage.setItem(UserSettings.SESSION_STORAGE_PREFIX + settingName,
settingObject.value.toString());
settingObject.resetFunction(settingObject.value);
}
get(settingName: string) {
return this.settings.get(settingName).value;
}
set(settingName: string, value: boolean) {
this.settings.get(settingName).value = value;
}
resetFromSessionStorage() {
this.settings.forEach((settingObject: UserSettingsObject,
settingName: string) => {
const storedString =
window.sessionStorage.getItem(UserSettings.SESSION_STORAGE_PREFIX + settingName);
if (storedString) {
const storedValue = storedString == "true" ? true : false;
this.set(settingName, storedValue);
if (storedValue) {
const toggle =
(document.getElementById("range-toggle-" + settingName) as HTMLInputElement);
if (!toggle.checked) {
toggle.checked = storedValue;
settingObject.resetFunction(storedValue);
}
}
}
});
}
}
// Store the required data from the blocks JSON. // Store the required data from the blocks JSON.
class BlocksData { class BlocksData {
blockBorders: Set<number>; blockBorders: Set<number>;
...@@ -185,13 +254,13 @@ class Divs { ...@@ -185,13 +254,13 @@ class Divs {
yAxis: HTMLElement; yAxis: HTMLElement;
grid: HTMLElement; grid: HTMLElement;
constructor() { constructor(userSettings: UserSettings) {
this.container = document.getElementById("ranges"); this.container = document.getElementById("ranges");
this.resizerBar = document.getElementById("resizer-ranges"); this.resizerBar = document.getElementById("resizer-ranges");
this.snapper = document.getElementById("show-hide-ranges"); this.snapper = document.getElementById("show-hide-ranges");
this.content = document.createElement("div"); this.content = document.createElement("div");
this.content.appendChild(this.elementForTitle()); this.content.appendChild(this.elementForTitle(userSettings));
this.showOnLoad = document.createElement("div"); this.showOnLoad = document.createElement("div");
this.showOnLoad.style.visibility = "hidden"; this.showOnLoad.style.visibility = "hidden";
...@@ -209,7 +278,7 @@ class Divs { ...@@ -209,7 +278,7 @@ class Divs {
this.registerHeaders.appendChild(this.registers); this.registerHeaders.appendChild(this.registers);
} }
elementForTitle() { elementForTitle(userSettings: UserSettings) {
const titleEl = createElement("div", "range-title-div"); const titleEl = createElement("div", "range-title-div");
const titleBar = createElement("div", "range-title"); const titleBar = createElement("div", "range-title");
titleBar.appendChild(createElement("div", "", "Live Ranges")); titleBar.appendChild(createElement("div", "", "Live Ranges"));
...@@ -220,6 +289,7 @@ class Divs { ...@@ -220,6 +289,7 @@ class Divs {
+ "\nand j, the index of the interval within the LiveRange, to give i:j."; + "\nand j, the index of the interval within the LiveRange, to give i:j.";
titleEl.appendChild(titleBar); titleEl.appendChild(titleBar);
titleEl.appendChild(titleHelp); titleEl.appendChild(titleHelp);
titleEl.appendChild(userSettings.getToggleElement("landscapeMode", "Landscape Mode"));
return titleEl; return titleEl;
} }
} }
...@@ -862,6 +932,7 @@ export class RangeView { ...@@ -862,6 +932,7 @@ export class RangeView {
isShown: boolean; isShown: boolean;
numPositions: number; numPositions: number;
cssVariables: CSSVariables; cssVariables: CSSVariables;
userSettings: UserSettings;
divs: Divs; divs: Divs;
rowConstructor: RowConstructor; rowConstructor: RowConstructor;
phaseChangeHandler: PhaseChangeHandler; phaseChangeHandler: PhaseChangeHandler;
...@@ -881,8 +952,11 @@ export class RangeView { ...@@ -881,8 +952,11 @@ export class RangeView {
this.gridAccessor = new GridAccessor(this.sequenceView); this.gridAccessor = new GridAccessor(this.sequenceView);
this.intervalsAccessor = new IntervalElementsAccessor(this.sequenceView); this.intervalsAccessor = new IntervalElementsAccessor(this.sequenceView);
this.cssVariables = new CSSVariables(); this.cssVariables = new CSSVariables();
this.userSettings = new UserSettings();
// Indicates whether the RangeView is displayed beside or below the SequenceView.
this.userSettings.addSetting("landscapeMode", false, this.resetLandscapeMode.bind(this));
this.blocksData = new BlocksData(blocks); this.blocksData = new BlocksData(blocks);
this.divs = new Divs(); this.divs = new Divs(this.userSettings);
this.scrollHandler = new ScrollHandler(this.divs); this.scrollHandler = new ScrollHandler(this.divs);
this.numPositions = this.sequenceView.numInstructions * Constants.POSITIONS_PER_INSTRUCTION; this.numPositions = this.sequenceView.numInstructions * Constants.POSITIONS_PER_INSTRUCTION;
this.rowConstructor = new RowConstructor(this); this.rowConstructor = new RowConstructor(this);
...@@ -909,6 +983,7 @@ export class RangeView { ...@@ -909,6 +983,7 @@ export class RangeView {
window.dispatchEvent(new Event('resize')); window.dispatchEvent(new Event('resize'));
setTimeout(() => { setTimeout(() => {
this.userSettings.resetFromSessionStorage();
this.scrollHandler.restoreScroll(); this.scrollHandler.restoreScroll();
this.scrollHandler.syncHidden(); this.scrollHandler.syncHidden();
this.divs.showOnLoad.style.visibility = "visible"; this.divs.showOnLoad.style.visibility = "visible";
...@@ -935,4 +1010,15 @@ export class RangeView { ...@@ -935,4 +1010,15 @@ export class RangeView {
onresize() { onresize() {
if (this.isShown) this.scrollHandler.syncHidden(); if (this.isShown) this.scrollHandler.syncHidden();
} }
resetLandscapeMode(isInLandscapeMode: boolean) {
// Used to communicate the setting to Resizer.
this.divs.container.dataset.landscapeMode = isInLandscapeMode.toString();
window.dispatchEvent(new Event('resize'));
// Required to adjust scrollbar spacing.
setTimeout(() => {
window.dispatchEvent(new Event('resize'));
}, 100);
}
} }
This diff is collapsed.
...@@ -46,7 +46,13 @@ ...@@ -46,7 +46,13 @@
display: inline-block; display: inline-block;
} }
input.range-toggle-show { label.range-toggle-setting {
text-align: right;
float: right;
}
input.range-toggle-show,
input.range-toggle-setting {
vertical-align: middle; vertical-align: middle;
} }
......
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