Skip to content

Commit

Permalink
profiler: rewrite internals
Browse files Browse the repository at this point in the history 
test262: 11.85% | 🧪 50005 | 🤠 5926 | ❌ 1680 | 💀 15654 (-1) | 🏗️ 2478 (+1) | 💥 1303 | ⏰ 2 | 📝 22962
  • Loading branch information
@CanadaHonk
CanadaHonk committed May 1, 2024
1 parent 6bc80ea commit 56a88dd
Show file tree
Hide file tree
Showing 8 changed files with 73 additions and 46 deletions.
2 changes: 1 addition & 1 deletion asur/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -985,7 +985,7 @@ const stringifyOp = ({ types, funcs, codes, imports, globals }, op, porfFunc = o
if (!porfFunc.invLocals) porfFunc.invLocals = inv(porfFunc.locals, x => x.idx);

if (op.func != null) {
str += ` \x1b[90m${op.func >= imports.length ? `${noHighlight(codes[op.func - imports.length].bc.porfFunc.name)}` : `${({ p: 'print', c: 'printChar', t: 'time', z: 'profile' })[imports[op.func].name]}`}`;
str += ` \x1b[90m${op.func >= imports.length ? `${noHighlight(codes[op.func - imports.length].bc.porfFunc.name)}` : `${({ p: 'print', c: 'printChar', t: 'time', y: 'profile1', z: 'profile2' })[imports[op.func].name]}`}`;
const type = types[op.func >= imports.length ? funcs[op.func - imports.length] : imports[op.func].typeIdx];
str += ` (${type.params.map(x => noHighlight(invValtype[x])).join(', ')}) -> (${type.returns.map(x => noHighlight(invValtype[x])).join(', ')})`;
str += '\x1b[0m';
Expand Down
2 changes: 1 addition & 1 deletion compiler/assemble.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export default (funcs, globals, tags, pages, data, flags) => {

const importSection = importFuncs.length === 0 ? [] : createSection(
Section.import,
encodeVector(importFuncs.map(x => [ 0, ...encodeString(x.import), ExportDesc.func, getType(new Array(x.params).fill(valtypeBinary), new Array(x.returns).fill(valtypeBinary)) ]))
encodeVector(importFuncs.map(x => [ 0, ...encodeString(x.import), ExportDesc.func, getType(new Array(x.params).fill(x.name.startsWith('profile') ? Valtype.i32 : valtypeBinary), new Array(x.returns).fill(valtypeBinary)) ]))
);

const funcSection = createSection(
Expand Down
10 changes: 8 additions & 2 deletions compiler/builtins.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,18 @@ export const importedFuncs = [
returns: 1
},
{
name: 'profile',
name: 'profile1',
import: 'y',
params: 1,
returns: 0
},
{
name: 'profile2',
import: 'z',
params: 1,
returns: 0
}
].filter(x => x);
];

for (let i = 0; i < importedFuncs.length; i++) {
const f = importedFuncs[i];
Expand Down
3 changes: 3 additions & 0 deletions compiler/codegen.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1845,6 +1845,9 @@ const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
// pointer, value, align, offset
i32_store16: { imms: 2, args: 2 },

// value
i32_const: { imms: 1, args: 0 },

// a, b
i32_or: { imms: 0, args: 2 },
};
Expand Down
1 change: 1 addition & 0 deletions compiler/wrap.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ export default async (source, flags = [ 'module' ], customImports = {}, print =
p: valtype === 'i64' ? i => print(Number(i).toString()) : i => print(i.toString()),
c: valtype === 'i64' ? i => print(String.fromCharCode(Number(i))) : i => print(String.fromCharCode(i)),
t: () => performance.now(),
y: () => {},
z: () => {},
...customImports
}
Expand Down
29 changes: 13 additions & 16 deletions runner/debug.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ let funcs = {}, funcId = 0;
source = source.replace(/^\s*(function|const)\s*([a-zA-Z0-9]+)(\s*=\s*)?\([^)]*\)\s*(=>)?\s*\{$/gm, (x, _, n) => {
const id = funcId++;
funcs[funcId] = n;
return `${x}profile(${100000 + id})`;
return `${x}profile2(Porffor.wasm.i32.const(${id}))`;
});

const lines = source.split('\n');
for (let i = 0; i < lines.length; i++) {
// lines[line] = lines[line].replace(/^[^\n}]*;$/, _ => `profile(${line});${_}`);
if (lines[i].trim().replace('}', '') !== '') lines[i] = `profile(${i});` + lines[i];
if (lines[i].trim().replace('}', '') !== '') lines[i] = `profile1(Porffor.wasm.i32.const(${i}));` + lines[i];
}
source = lines.join('\n');

Expand Down Expand Up @@ -48,20 +48,7 @@ let output = '';

try {
const { exports } = await compile(source, process.argv.includes('--module') ? [ 'module' ] : [], {
z: n => {
if (n >= 100000) {
// start of call
callStack.push(funcs[n - 100000]);

callStarts.push(lastLine);

_paused = paused;
if (!stepIn) paused = false;
else paused = true;

return;
}

y: n => {
if (callStarts[callStarts.length - 1] === n - 1) {
// end of call

Expand Down Expand Up @@ -116,6 +103,16 @@ try {
}
}
}
},
z: n => {
// start of call
callStack.push(funcs[n]);

callStarts.push(lastLine);

_paused = paused;
if (!stepIn) paused = false;
else paused = true;
}
}, s => output += s);

Expand Down
71 changes: 45 additions & 26 deletions runner/profiler.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,22 @@ import fs from 'node:fs';

import Prefs from '../compiler/prefs.js';

const fast = Prefs.profiler === 'fast';
// const fast = Prefs.profiler === 'fast';
const fast = !Prefs.experimentalProfiler;

const file = process.argv.slice(2).find(x => x[0] !== '-');
let source = fs.readFileSync(file, 'utf8');

let profileId = 0;
source = fast ? source.replace(/^[^\n}]*;$/mg, _ => `profile(${profileId++});${_}profile(${profileId++});`) : source.replace(/^[^\n}]*;$/mg, _ => `profile(${profileId++});profile(${profileId++});${_}profile(${profileId++});`);
// source = fast ? source.replace(/^[^\n}]*;$/mg, _ => `profile(${profileId++});${_}profile(${profileId++});`) : source.replace(/^[^\n}]*;$/mg, _ => `profile(${profileId++});profile(${profileId++});${_}profile(${profileId++});`);
// source = fast ? source.replace(/^[^\n}]*;$/mg, _ => `profile(Porffor.wasm.i32.const(${profileId++}));${_}profile(Porffor.wasm.i32.const(${profileId++}));`) : source.replace(/^[^\n}]*;$/mg, _ => `profile(${profileId++});profile(${profileId++});${_}profile(${profileId++});`);
source = fast ? source.replace(/^[^\n}]*;$/mg, _ => `profile1(Porffor.wasm.i32.const(${profileId}));${_}profile2(Porffor.wasm.i32.const(${profileId++}));`) : source.replace(/^[^\n}]*;$/mg, _ => `profile(${profileId++});profile(${profileId++});${_}profile(${profileId++});`);

// console.log(source);

// let tmp = new Array(profileId).fill(0);
let tmp = new Array(profileId).fill(0);
let times = new Array(profileId).fill(0);
let samples = 0;

const percents = process.argv.includes('-%');
Expand All @@ -26,25 +31,31 @@ let last = 0;

try {
const { exports } = await compile(source, process.argv.includes('--module') ? [ 'module' ] : [], {
y: fast ? n => {
tmp[n] = performance.now();
} : n => { /* todo */ },
z: fast ? n => {
if (n % 2) {
tmp[n] += performance.now() - tmp[n - 1];
} else {
tmp[n] = performance.now();
}
} : n => {
if (n % 3 === 2) {
tmp[n] += (performance.now() - tmp[n - 1]) - (tmp[n - 1] - tmp[n - 2]);
samples++;

if (performance.now() > last) {
process.stdout.write(`\r${spinner[spin++ % 4]} running: collected ${samples} samples...`);
last = performance.now() + 100;
}
} else {
tmp[n] = performance.now();
}
}
times[n] += performance.now() - tmp[n];
} : n => { /* todo */ }
// z: fast ? n => {
// if (n % 2) {
// tmp[n] += performance.now() - tmp[n - 1];
// } else {
// tmp[n] = performance.now();
// }
// } : n => {
// if (n % 3 === 2) {
// tmp[n] += (performance.now() - tmp[n - 1]) - (tmp[n - 1] - tmp[n - 2]);
// samples++;

// if (performance.now() > last) {
// process.stdout.write(`\r${spinner[spin++ % 4]} running: collected ${samples} samples...`);
// last = performance.now() + 100;
// }
// } else {
// tmp[n] = performance.now();
// }
// }
});

const start = performance.now();
Expand All @@ -53,30 +64,38 @@ try {

const total = performance.now() - start;

console.log(`\nsamples: ${fast ? 'not measured' : samples}\ntotal: ${total}ms\n\n` + source.split('\n').map(x => {
console.log(`\n${fast ? '' : `samples: ${samples}\n`}total: ${total}ms\n\n` + source.split('\n').map(x => {
let time = 0;
if (x.startsWith('profile')) {
const id = parseInt(x.slice(8, x.indexOf(')')));
time = fast ? tmp[id + 1] : tmp[id + 2];
// const id = parseInt(x.slice(8, x.indexOf(')')));
// const id = parseInt(x.slice(31, x.indexOf(')') + 1));
const id = parseInt(x.slice(32, x.indexOf(')')));
// time = fast ? tmp[id + 1] : tmp[id + 2];
time = fast ? times[id] : tmp[id + 2];
}

let color = [ 0, 0, 0 ];
if (time) {
const relativeTime = Math.sqrt(time / total);
let relativeTime = time / total;
if (percents) time = relativeTime;

relativeTime = Math.sqrt(relativeTime);
color = [ (relativeTime * 250) | 0, (Math.sin(relativeTime * Math.PI) * 50) | 0, 0 ];
}

const ansiColor = `2;${color[0]};${color[1]};${color[2]}m`;

if (percents) return `\x1b[48;${ansiColor}\x1b[97m${time ? ((time * 100).toFixed(0).padStart(4, ' ') + '%') : ' '}\x1b[0m\x1b[38;${ansiColor}▌\x1b[0m ${x.replace(/profile\([0-9]+\);/g, '')}`;
// const line = x.replace(/profile\([0-9]+\);/g, '');
// const line = x.replace(/profile\(Porffor.wasm.i32.const\([0-9]+\)\);/g, '');
const line = x.replace(/profile[0-9]\(Porffor.wasm.i32.const\([0-9]+\)\);/g, '');

if (percents) return `\x1b[48;${ansiColor}\x1b[97m${time ? ((time * 100).toFixed(0).padStart(4, ' ') + '%') : ' '}\x1b[0m\x1b[38;${ansiColor}▌\x1b[0m ${line}`;

let digits = 2;
if (time >= 100) digits = 1;
if (time >= 1000) digits = 0;

return `\x1b[48;${ansiColor}\x1b[97m${time ? time.toFixed(digits).padStart(6, ' ') : ' '}\x1b[0m\x1b[38;${ansiColor}▌\x1b[0m ${x.replace(/profile\([0-9]+\);/g, '')}`;
return `\x1b[48;${ansiColor}\x1b[97m${time ? time.toFixed(digits).padStart(6, ' ') : ' '}\x1b[0m\x1b[38;${ansiColor}▌\x1b[0m ${line}`;
}).join('\n'));
} catch (e) {
console.error(e);
Expand Down
1 change: 1 addition & 0 deletions test262/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ const run = ({ file, contents, attrs }) => {
p: () => {},
c: () => {},
t: () => performance.now(),
y: () => {},
z: () => {},
}
})).exports;
Expand Down

0 comments on commit 56a88dd

Please sign in to comment.