wip

Author: pavelsavara

src/mono/mono/mini/interp/interp-internals.h

@@ -97,7 +97,11 @@ typedef enum {
 	IMETHOD_CODE_UNKNOWN
 } InterpMethodCodeType;
 
+#ifdef HOST_WASM
 #define PROFILE_INTERP 1
+#else
+#define PROFILE_INTERP 0
+#endif
 
 #define INTERP_IMETHOD_TAG_1(im) ((gpointer)((mono_u)(im) | 1))
 #define INTERP_IMETHOD_IS_TAGGED_1(im) ((mono_u)(im) & 1)

src/mono/mono/mini/interp/interp.c

@@ -228,8 +228,10 @@ reinit_frame (InterpFrame *frame, InterpFrame *parent, InterpMethod *imethod, gp
 	frame->retval = (stackval*)retval;
 	frame->state.ip = NULL;
 #if PROFILE_INTERP
+#ifdef HOST_WASM
 	frame->timestamp_before_entry = mono_wasm_timestamp();
-#endif
+#endif /* HOST_WASM */
+#endif /* PROFILE_INTERP */
 }
 
 
@@ -7365,15 +7367,10 @@ MINT_IN_CASE(MINT_BRTRUE_I8_SP) ZEROP_SP(gint64, !=); MINT_IN_BREAK;
 	g_assert_checked (frame->imethod);
 
 #if PROFILE_INTERP
-	/*struct timespec time;
-	g_assert (clock_gettime (CLOCK_REALTIME, &time) == 0);
-	int64_t now = system_time_to_int64 (time.tv_sec, time.tv_nsec);
-	int64_t duration = now - frame->timestamp_before_entry;
-	char *method_name = mono_method_get_name_full (frame->imethod->method, TRUE, FALSE, MONO_TYPE_NAME_FORMAT_IL);
-	mono_trace (G_LOG_LEVEL_DEBUG, MONO_TRACE_PROFILER, "Measure %s %d", method_name, duration);
-	g_free (method_name);*/
+#ifdef HOST_WASM
 	mono_wasm_measure (frame->imethod->method, frame->timestamp_before_entry);
-#endif
+#endif /* HOST_WASM */
+#endif /* PROFILE_INTERP */
 
 	if (frame->parent && frame->parent->state.ip) {
 		/* Return to the main loop after a non-recursive interpreter call */

src/mono/wasm/runtime/driver.c

@@ -70,6 +70,7 @@ int32_t monoeg_g_hasenv(const char *variable);
 void mono_free (void*);
 int32_t mini_parse_debug_option (const char *option);
 char *mono_method_get_full_name (MonoMethod *method);
+char *mono_method_full_name (MonoMethod *method, int signature);
 
 static void mono_wasm_init_finalizer_thread (void);
 
@@ -1485,5 +1486,5 @@ EMSCRIPTEN_KEEPALIVE int mono_wasm_f64_to_i52 (int64_t *destination, double valu
 //extern const char* mono_method_get_full_name (MonoMethod *method);
 
 EMSCRIPTEN_KEEPALIVE const char* mono_wasm_method_get_name (MonoMethod *method) {
-	return mono_method_get_full_name(method);
+	return mono_method_full_name(method, 0);
 }

src/mono/wasm/runtime/performance.ts

@@ -17,7 +17,7 @@ export const enum MeasuredBlock {
     callCsFunction = "mono.callCsFunction:",
     getAssemblyExports = "mono.getAssemblyExports:",
     instantiateAsset = "mono.instantiateAsset:",
-    interp = "mono.interp:",
+    interp = "interp:",
 }
 
 let uniqueId = 0;