X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=prvm_exec.c;h=ca1c191cb04c6835578a2ce421aec3fe60d1e385;hb=179be6fd1f715bac570e73aa9cadb0e08d0f7979;hp=f644f9fde03996cf21f824074ccc5f83737b3bcb;hpb=a44c18f516d470fe652cbea592065a5d23b5531c;p=xonotic%2Fdarkplaces.git diff --git a/prvm_exec.c b/prvm_exec.c index f644f9fd..ca1c191c 100644 --- a/prvm_exec.c +++ b/prvm_exec.c @@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" #include "progsvm.h" -char *prvm_opnames[] = +const char *prvm_opnames[] = { "^5DONE", @@ -112,6 +112,7 @@ char *prvm_opnames[] = char *PRVM_GlobalString (int ofs); char *PRVM_GlobalStringNoContents (int ofs); +extern ddef_t *PRVM_ED_FieldAtOfs(int ofs); //============================================================================= @@ -122,6 +123,7 @@ PRVM_PrintStatement ================= */ extern cvar_t prvm_statementprofiling; +extern cvar_t prvm_timeprofiling; void PRVM_PrintStatement (dstatement_t *s) { size_t i; @@ -211,7 +213,7 @@ void PRVM_PrintFunctionStatements (const char *name) endstatement = prog->functions[i].first_statement; // now print the range of statements - Con_Printf("%s progs: disassembly of function %s (statements %i-%i):\n", PRVM_NAME, name, firststatement, endstatement); + Con_Printf("%s progs: disassembly of function %s (statements %i-%i, locals %i-%i):\n", PRVM_NAME, name, firststatement, endstatement, func->parm_start, func->parm_start + func->locals - 1); for (i = firststatement;i < endstatement;i++) { PRVM_PrintStatement(prog->statements + i); @@ -276,7 +278,7 @@ void PRVM_ShortStackTrace(char *buf, size_t bufsize) } else { - strlcpy(buf, "", sizeof(buf)); + strlcpy(buf, "", bufsize); return; } @@ -297,7 +299,7 @@ void PRVM_ShortStackTrace(char *buf, size_t bufsize) } -void PRVM_CallProfile () +void PRVM_CallProfile (void) { mfunction_t *f, *best; int i; @@ -334,13 +336,21 @@ void PRVM_CallProfile () prog->starttime = Sys_DoubleTime(); } -void PRVM_Profile (int maxfunctions, int mininstructions) +void PRVM_Profile (int maxfunctions, double mintime, int sortby) { mfunction_t *f, *best; int i, num; double max; - Con_Printf( "%s Profile:\n[CallCount] [Statements] [BuiltinCost]\n", PRVM_NAME ); + if(!prvm_timeprofiling.integer) + mintime *= 10000000; // count each statement as about 0.1µs + + if(prvm_timeprofiling.integer) + Con_Printf( "%s Profile:\n[CallCount] [Time] [BuiltinTm] [Statement] [BuiltinCt] [TimeTotal] [StmtTotal] [BltnTotal] [self]\n", PRVM_NAME ); + // 12345678901 12345678901 12345678901 12345678901 12345678901 12345678901 12345678901 123.45% + else + Con_Printf( "%s Profile:\n[CallCount] [Statement] [BuiltinCt] [StmtTotal] [BltnTotal] [self]\n", PRVM_NAME ); + // 12345678901 12345678901 12345678901 12345678901 12345678901 123.45% num = 0; do @@ -350,24 +360,85 @@ void PRVM_Profile (int maxfunctions, int mininstructions) for (i=0 ; iprogs->numfunctions ; i++) { f = &prog->functions[i]; - if (max < f->profile + f->builtinsprofile + f->callcount) + if(prvm_timeprofiling.integer) { - max = f->profile + f->builtinsprofile + f->callcount; - best = f; + if(sortby) + { + if(f->first_statement < 0) + { + if (max < f->tprofile) + { + max = f->tprofile; + best = f; + } + } + else + { + if (max < f->tprofile_total) + { + max = f->tprofile_total; + best = f; + } + } + } + else + { + if (max < f->tprofile + f->tbprofile) + { + max = f->tprofile + f->tbprofile; + best = f; + } + } + } + else + { + if(sortby) + { + if (max < f->profile_total + f->builtinsprofile_total + f->callcount) + { + max = f->profile_total + f->builtinsprofile_total + f->callcount; + best = f; + } + } + else + { + if (max < f->profile + f->builtinsprofile + f->callcount) + { + max = f->profile + f->builtinsprofile + f->callcount; + best = f; + } + } } } if (best) { - if (num < maxfunctions && max >= mininstructions) + if (num < maxfunctions && max > mintime) { - if (best->first_statement < 0) - Con_Printf("%9.0f ----- builtin ----- %s\n", best->callcount, PRVM_GetString(best->s_name)); + if(prvm_timeprofiling.integer) + { + if (best->first_statement < 0) + Con_Printf("%11.0f %11.6f ------------- builtin ------------- %11.6f ----------- builtin ----------- %s\n", best->callcount, best->tprofile, best->tprofile, PRVM_GetString(best->s_name)); + // %11.6f 12345678901 12345678901 12345678901 %11.6f 12345678901 12345678901 123.45% + else + Con_Printf("%11.0f %11.6f %11.6f %11.0f %11.0f %11.6f %11.0f %11.0f %6.2f%% %s\n", best->callcount, best->tprofile, best->tbprofile, best->profile, best->builtinsprofile, best->tprofile_total, best->profile_total, best->builtinsprofile_total, (best->tprofile_total > 0) ? ((best->tprofile) * 100.0 / (best->tprofile_total)) : -99.99, PRVM_GetString(best->s_name)); + } else - Con_Printf("%9.0f %9.0f %9.0f %s\n", best->callcount, best->profile, best->builtinsprofile, PRVM_GetString(best->s_name)); + { + if (best->first_statement < 0) + Con_Printf("%11.0f ----------------------- builtin ----------------------- %s\n", best->callcount, PRVM_GetString(best->s_name)); + // 12345678901 12345678901 12345678901 12345678901 123.45% + else + Con_Printf("%11.0f %11.0f %11.0f %11.0f %11.0f %6.2f%% %s\n", best->callcount, best->profile, best->builtinsprofile, best->profile_total, best->builtinsprofile_total, (best->profile + best->builtinsprofile) * 100.0 / (best->profile_total + best->builtinsprofile_total), PRVM_GetString(best->s_name)); + } } num++; best->profile = 0; + best->tprofile = 0; + best->tbprofile = 0; best->builtinsprofile = 0; + best->profile_total = 0; + best->tprofile_total = 0; + best->builtinsprofile_total = 0; best->callcount = 0; } } while (best); @@ -419,12 +490,34 @@ void PRVM_Profile_f (void) if(!PRVM_SetProgFromString(Cmd_Argv(1))) return; - PRVM_Profile(howmany, 1); + PRVM_Profile(howmany, 0, 0); + + PRVM_End; +} + +void PRVM_ChildProfile_f (void) +{ + int howmany; + + howmany = 1<<30; + if (Cmd_Argc() == 3) + howmany = atoi(Cmd_Argv(2)); + else if (Cmd_Argc() != 2) + { + Con_Print("prvm_childprofile \n"); + return; + } + + PRVM_Begin; + if(!PRVM_SetProgFromString(Cmd_Argv(1))) + return; + + PRVM_Profile(howmany, 0, 1); PRVM_End; } -void PRVM_CrashAll() +void PRVM_CrashAll(void) { int i; prvm_prog_t *oldprog = prog; @@ -443,6 +536,10 @@ void PRVM_CrashAll() void PRVM_PrintState(void) { int i; + if(prog->statestring) + { + Con_Printf("Caller-provided information: %s\n", prog->statestring); + } if (prog->xfunction) { for (i = -7; i <= 0;i++) @@ -511,6 +608,9 @@ int PRVM_EnterFunction (mfunction_t *f) prog->stack[prog->depth].s = prog->xstatement; prog->stack[prog->depth].f = prog->xfunction; + prog->stack[prog->depth].profile_acc = -f->profile; + prog->stack[prog->depth].tprofile_acc = -f->tprofile + -f->tbprofile; + prog->stack[prog->depth].builtinsprofile_acc = -f->builtinsprofile; prog->depth++; if (prog->depth >=PRVM_MAX_STACK_DEPTH) PRVM_ERROR ("stack overflow"); @@ -535,6 +635,7 @@ int PRVM_EnterFunction (mfunction_t *f) } } + ++f->recursion; prog->xfunction = f; return f->first_statement - 1; // offset the s++ } @@ -547,6 +648,7 @@ PRVM_LeaveFunction int PRVM_LeaveFunction (void) { int i, c; + mfunction_t *f; if (prog->depth <= 0) PRVM_ERROR ("prog stack underflow in %s", PRVM_NAME); @@ -564,7 +666,29 @@ int PRVM_LeaveFunction (void) // up stack prog->depth--; + f = prog->xfunction; + --f->recursion; prog->xfunction = prog->stack[prog->depth].f; + prog->stack[prog->depth].profile_acc += f->profile; + prog->stack[prog->depth].tprofile_acc += f->tprofile + f->tbprofile; + prog->stack[prog->depth].builtinsprofile_acc += f->builtinsprofile; + if(prog->depth > 0) + { + prog->stack[prog->depth-1].profile_acc += prog->stack[prog->depth].profile_acc; + prog->stack[prog->depth-1].tprofile_acc += prog->stack[prog->depth].tprofile_acc; + prog->stack[prog->depth-1].builtinsprofile_acc += prog->stack[prog->depth].builtinsprofile_acc; + } + if(!f->recursion) + { + // if f is already on the call stack... + // we cannot add this profile data to it now + // or we would add it more than once + // so, let's only add to the function's profile if it is the outermost call + f->profile_total += prog->stack[prog->depth].profile_acc; + f->tprofile_total += prog->stack[prog->depth].tprofile_acc; + f->builtinsprofile_total += prog->stack[prog->depth].builtinsprofile_acc; + } + return prog->stack[prog->depth].s; } @@ -577,12 +701,6 @@ void PRVM_Init_Exec(void) // nothing here yet } -/* -==================== -PRVM_ExecuteProgram -==================== -*/ -// LordHavoc: optimized #define OPA ((prvm_eval_t *)&prog->globals.generic[(unsigned short) st->a]) #define OPB ((prvm_eval_t *)&prog->globals.generic[(unsigned short) st->b]) #define OPC ((prvm_eval_t *)&prog->globals.generic[(unsigned short) st->c]) @@ -590,8 +708,14 @@ extern cvar_t prvm_traceqc; extern cvar_t prvm_statementprofiling; extern sizebuf_t vm_tempstringsbuf; extern qboolean prvm_runawaycheck; -extern qboolean prvm_boundscheck; -void PRVM_ExecuteProgram (func_t fnum, const char *errormessage) + +#ifdef PROFILING +/* +==================== +MVM_ExecuteProgram +==================== +*/ +void MVM_ExecuteProgram (func_t fnum, const char *errormessage) { dstatement_t *st, *startst; mfunction_t *f, *newf; @@ -600,6 +724,7 @@ void PRVM_ExecuteProgram (func_t fnum, const char *errormessage) int jumpcount, cachedpr_trace, exitdepth; int restorevm_tempstringsbuf_cursize; double calltime; + double tm, starttm; calltime = Sys_DoubleTime(); @@ -607,7 +732,7 @@ void PRVM_ExecuteProgram (func_t fnum, const char *errormessage) { if (prog->globaloffsets.self >= 0 && PRVM_GLOBALFIELDVALUE(prog->globaloffsets.self)->edict) PRVM_ED_Print(PRVM_PROG_TO_EDICT(PRVM_GLOBALFIELDVALUE(prog->globaloffsets.self)->edict), NULL); - PRVM_ERROR ("PRVM_ExecuteProgram: %s", errormessage); + PRVM_ERROR ("MVM_ExecuteProgram: %s", errormessage); } f = &prog->functions[fnum]; @@ -626,6 +751,7 @@ void PRVM_ExecuteProgram (func_t fnum, const char *errormessage) // (when the function exits or jumps, the (st - startst) integer value is // added to the function's profile counter) startst = st; + starttm = calltime; // instead of counting instructions, we count jumps jumpcount = 0; // add one to the callcount of this function because otherwise engine-called functions aren't counted @@ -633,150 +759,221 @@ void PRVM_ExecuteProgram (func_t fnum, const char *errormessage) chooseexecprogram: cachedpr_trace = prog->trace; - if (prvm_runawaycheck) + if (prvm_statementprofiling.integer || prog->trace) { -#define PRVMRUNAWAYCHECK 1 - if (prvm_statementprofiling.integer) +#define PRVMSLOWINTERPRETER 1 + if (prvm_timeprofiling.integer) { -#define PRVMSTATEMENTPROFILING 1 - if (prvm_boundscheck) - { -#define PRVMBOUNDSCHECK 1 - if (prog->trace) - { -#define PRVMTRACE 1 -#include "prvm_execprogram.h" -#undef PRVMTRACE - } - else - { +#define PRVMTIMEPROFILING 1 #include "prvm_execprogram.h" - } -#undef PRVMBOUNDSCHECK - } - else - { - if (prog->trace) - { -#define PRVMTRACE 1 +#undef PRVMTIMEPROFILING + } + else + { #include "prvm_execprogram.h" -#undef PRVMTRACE - } - else - { + } +#undef PRVMSLOWINTERPRETER + } + else + { + if (prvm_timeprofiling.integer) + { +#define PRVMTIMEPROFILING 1 #include "prvm_execprogram.h" - } - } -#undef PRVMSTATEMENTPROFILING +#undef PRVMTIMEPROFILING } else { - if (prvm_boundscheck) - { -#define PRVMBOUNDSCHECK 1 - if (prog->trace) - { -#define PRVMTRACE 1 -#include "prvm_execprogram.h" -#undef PRVMTRACE - } - else - { #include "prvm_execprogram.h" - } -#undef PRVMBOUNDSCHECK - } - else - { - if (prog->trace) - { -#define PRVMTRACE 1 + } + } + +cleanup: + if (developer_insane.integer && vm_tempstringsbuf.cursize > restorevm_tempstringsbuf_cursize) + Con_DPrintf("MVM_ExecuteProgram: %s used %i bytes of tempstrings\n", PRVM_GetString(prog->functions[fnum].s_name), vm_tempstringsbuf.cursize - restorevm_tempstringsbuf_cursize); + // delete tempstrings created by this function + vm_tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize; + + f->totaltime += (Sys_DoubleTime() - calltime); + + SV_FlushBroadcastMessages(); +} + +/* +==================== +CLVM_ExecuteProgram +==================== +*/ +void CLVM_ExecuteProgram (func_t fnum, const char *errormessage) +{ + dstatement_t *st, *startst; + mfunction_t *f, *newf; + prvm_edict_t *ed; + prvm_eval_t *ptr; + int jumpcount, cachedpr_trace, exitdepth; + int restorevm_tempstringsbuf_cursize; + double calltime; + double tm, starttm; + + calltime = Sys_DoubleTime(); + + if (!fnum || fnum >= (unsigned int)prog->progs->numfunctions) + { + if (prog->globaloffsets.self >= 0 && PRVM_GLOBALFIELDVALUE(prog->globaloffsets.self)->edict) + PRVM_ED_Print(PRVM_PROG_TO_EDICT(PRVM_GLOBALFIELDVALUE(prog->globaloffsets.self)->edict), NULL); + PRVM_ERROR ("CLVM_ExecuteProgram: %s", errormessage); + } + + f = &prog->functions[fnum]; + + // after executing this function, delete all tempstrings it created + restorevm_tempstringsbuf_cursize = vm_tempstringsbuf.cursize; + + prog->trace = prvm_traceqc.integer; + + // we know we're done when pr_depth drops to this + exitdepth = prog->depth; + +// make a stack frame + st = &prog->statements[PRVM_EnterFunction (f)]; + // save the starting statement pointer for profiling + // (when the function exits or jumps, the (st - startst) integer value is + // added to the function's profile counter) + startst = st; + starttm = calltime; + // instead of counting instructions, we count jumps + jumpcount = 0; + // add one to the callcount of this function because otherwise engine-called functions aren't counted + prog->xfunction->callcount++; + +chooseexecprogram: + cachedpr_trace = prog->trace; + if (prvm_statementprofiling.integer || prog->trace) + { +#define PRVMSLOWINTERPRETER 1 + if (prvm_timeprofiling.integer) + { +#define PRVMTIMEPROFILING 1 #include "prvm_execprogram.h" -#undef PRVMTRACE - } - else - { +#undef PRVMTIMEPROFILING + } + else + { #include "prvm_execprogram.h" - } - } } -#undef PRVMRUNAWAYCHECK 1 +#undef PRVMSLOWINTERPRETER } else { - if (prvm_statementprofiling.integer) + if (prvm_timeprofiling.integer) { -#define PRVMSTATEMENTPROFILING 1 - if (prvm_boundscheck) - { -#define PRVMBOUNDSCHECK 1 - if (prog->trace) - { -#define PRVMTRACE 1 -#include "prvm_execprogram.h" -#undef PRVMTRACE - } - else - { +#define PRVMTIMEPROFILING 1 #include "prvm_execprogram.h" - } -#undef PRVMBOUNDSCHECK - } - else - { - if (prog->trace) - { -#define PRVMTRACE 1 +#undef PRVMTIMEPROFILING + } + else + { #include "prvm_execprogram.h" -#undef PRVMTRACE - } - else - { + } + } + +cleanup: + if (developer_insane.integer && vm_tempstringsbuf.cursize > restorevm_tempstringsbuf_cursize) + Con_DPrintf("CLVM_ExecuteProgram: %s used %i bytes of tempstrings\n", PRVM_GetString(prog->functions[fnum].s_name), vm_tempstringsbuf.cursize - restorevm_tempstringsbuf_cursize); + // delete tempstrings created by this function + vm_tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize; + + f->totaltime += (Sys_DoubleTime() - calltime); + + SV_FlushBroadcastMessages(); +} +#endif + +/* +==================== +SVVM_ExecuteProgram +==================== +*/ +void SVVM_ExecuteProgram (func_t fnum, const char *errormessage) +{ + dstatement_t *st, *startst; + mfunction_t *f, *newf; + prvm_edict_t *ed; + prvm_eval_t *ptr; + int jumpcount, cachedpr_trace, exitdepth; + int restorevm_tempstringsbuf_cursize; + double calltime; + double tm, starttm; + + calltime = Sys_DoubleTime(); + + if (!fnum || fnum >= (unsigned int)prog->progs->numfunctions) + { + if (prog->globaloffsets.self >= 0 && PRVM_GLOBALFIELDVALUE(prog->globaloffsets.self)->edict) + PRVM_ED_Print(PRVM_PROG_TO_EDICT(PRVM_GLOBALFIELDVALUE(prog->globaloffsets.self)->edict), NULL); + PRVM_ERROR ("SVVM_ExecuteProgram: %s", errormessage); + } + + f = &prog->functions[fnum]; + + // after executing this function, delete all tempstrings it created + restorevm_tempstringsbuf_cursize = vm_tempstringsbuf.cursize; + + prog->trace = prvm_traceqc.integer; + + // we know we're done when pr_depth drops to this + exitdepth = prog->depth; + +// make a stack frame + st = &prog->statements[PRVM_EnterFunction (f)]; + // save the starting statement pointer for profiling + // (when the function exits or jumps, the (st - startst) integer value is + // added to the function's profile counter) + startst = st; + starttm = calltime; + // instead of counting instructions, we count jumps + jumpcount = 0; + // add one to the callcount of this function because otherwise engine-called functions aren't counted + prog->xfunction->callcount++; + +chooseexecprogram: + cachedpr_trace = prog->trace; + if (prvm_statementprofiling.integer || prog->trace) + { +#define PRVMSLOWINTERPRETER 1 + if (prvm_timeprofiling.integer) + { +#define PRVMTIMEPROFILING 1 #include "prvm_execprogram.h" - } - } -#undef PRVMSTATEMENTPROFILING +#undef PRVMTIMEPROFILING } else { - if (prvm_boundscheck) - { -#define PRVMBOUNDSCHECK 1 - if (prog->trace) - { -#define PRVMTRACE 1 -#include "prvm_execprogram.h" -#undef PRVMTRACE - } - else - { #include "prvm_execprogram.h" - } -#undef PRVMBOUNDSCHECK - } - else - { - if (prog->trace) - { -#define PRVMTRACE 1 + } +#undef PRVMSLOWINTERPRETER + } + else + { + if (prvm_timeprofiling.integer) + { +#define PRVMTIMEPROFILING 1 #include "prvm_execprogram.h" -#undef PRVMTRACE - } - else - { +#undef PRVMTIMEPROFILING + } + else + { #include "prvm_execprogram.h" - } - } } } cleanup: - if (developer.integer >= 200 && vm_tempstringsbuf.cursize > restorevm_tempstringsbuf_cursize) - Con_Printf("PRVM_ExecuteProgram: %s used %i bytes of tempstrings\n", PRVM_GetString(prog->functions[fnum].s_name), vm_tempstringsbuf.cursize - restorevm_tempstringsbuf_cursize); + if (developer_insane.integer && vm_tempstringsbuf.cursize > restorevm_tempstringsbuf_cursize) + Con_DPrintf("SVVM_ExecuteProgram: %s used %i bytes of tempstrings\n", PRVM_GetString(prog->functions[fnum].s_name), vm_tempstringsbuf.cursize - restorevm_tempstringsbuf_cursize); // delete tempstrings created by this function vm_tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize; - prog->functions[fnum].totaltime += (Sys_DoubleTime() - calltime); + f->totaltime += (Sys_DoubleTime() - calltime); SV_FlushBroadcastMessages(); }