haversine_02/compile

@@ -12,12 +12,8 @@ while [[ $# > 0 ]];do
 			RELEASE=true
 			shift
 			;;
-		--basic-profiling)
+		--enable-profiling)
-			BASIC_PROFILING=true
+			ENABLE_PROFILING=true
-			shift
-			;;
-		--full-profiling)
-			FULL_PROFILING=true
 			shift
 			;;
 		*|-*|--*)
@@ -50,11 +46,11 @@ echo
 
 # PROFILER
 PROFSRC="../src/profiler/timer.c"
-PROFFLAGS="-c "
+PROFFLAGS="-c"
 PROF_BUILD_DIR=prof_build
 
 # PROCESSOR
-JSONSRC="../src/json/*.c "
+JSONSRC="../src/json/*.c"
 JSONFLAGS="-c "
 JSON_BUILD_DIR=json_build
 
@@ -65,18 +61,10 @@ PROCSRC="./$JSON_BUILD_DIR/*.o \
 	./src/processor/main.cpp "
 PROCOUT=prochavr
 
-if [[ $BASIC_PROFILING == true ]] || [[ $FULL_PROFILING == true ]]; then
+if [[ $ENABLE_PROFILING == true ]]; then
-	if [[ $FULL_PROFILING == true ]]; then
+	JSONFLAGS+="-DENABLE_PROFILING"
-		JSONFLAGS+="-DFULL_PROFILING"
+	PROCSRC+="./$PROF_BUILD_DIR/*.o"
-		PROCFLAGS="-DFULL_PROFILING"
+	PROCFLAGS="-DENABLE_PROFILING"
-		PROFFLAGS+="-DFULL_PROFILING"
-	elif [[ $BASIC_PROFILING == true ]]; then
-		JSONFLAGS+="-DBASIC_PROFILING"
-		PROCFLAGS="-DBASIC_PROFILING"
-		PROFFLAGS+="-DBASIC_PROFILING"
-	fi
-
-	PROCSRC+=./$PROF_BUILD_DIR/*.o
 
 	mkdir $PROF_BUILD_DIR
 	cd $PROF_BUILD_DIR

haversine_02/include/profiler/timer.h

@@ -7,29 +7,17 @@
 #define MAX_PROFILE_SAMPLES 1024
 #endif // !MAX_PROFILE_SAMPLES
 
-#ifdef FULL_PROFILING
+#ifdef ENABLE_PROFILING
-#define SAMPLE_START(ID, TITLE) sample_start(ID, TITLE)
-#define SAMPLE_END(ID) sample_end(ID)
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void sample_start(u64 id, const char *title);
-void sample_end(u64 id);
-
-#ifdef __cplusplus
-}
-#endif
-
-#else
-#define SAMPLE_START(ID, TITLE)
-#define SAMPLE_END(ID)
-#endif // FULL_PROFILING
-
-#if defined(BASIC_PROFILING) || defined(FULL_PROFILING)
 #define PROFILE_START(COUNT) profile_start(COUNT)
 #define PROFILE_END profile_end()
+#define SAMPLE_START(ID, TITLE) sample_start(ID, TITLE)
+#define SAMPLE_END(ID) sample_end(ID)
+#else
+#define PROFILE_START(COUNT)
+#define PROFILE_END
+#define SAMPLE_START(ID, TITLE)
+#define SAMPLE_END(ID)
+#endif // ENABLE_PROFILING
 
 #ifdef __cplusplus
 extern "C" {
@@ -61,13 +49,11 @@ u64 get_cpu_freq(u64 milliseconds);
 void profile_start(u64 count);
 void profile_end();
 
+void sample_start(u64 id, const char *title);
+void sample_end(u64 id);
+
 #ifdef __cplusplus
 }
 #endif
 
-#else
-#define PROFILE_START(COUNT)
-#define PROFILE_END
-#endif // BASIC_PROFILING || FULL_PROFILING
-
 #endif // !TIMER_H

haversine_02/src/json/json_entities.c

@@ -1,6 +1,6 @@
 #include "json/json_entities.h"
 #include "aliases.h"
-#include "processor/ids.h"
+#include "profiler/ids.h"
 #include "profiler/timer.h"
 #include "json/dstring.h"
 #include <stdio.h>

haversine_02/src/json/parser.c

@@ -1,6 +1,6 @@
 #include "json/parser.h"
 #include "aliases.h"
-#include "processor/ids.h"
+#include "profiler/ids.h"
 #include "profiler/timer.h"
 #include "json/dstring.h"
 #include "json/json_entities.h"

haversine_02/src/processor/main.cpp

@@ -1,7 +1,7 @@
 #include "haversine.h"
 #include "point_types.h"
-#include "processor/ids.h"
 #include "processor/proc_argparser.h"
+#include "profiler/ids.h"
 #include "profiler/timer.h"
 #include "json/dstring.h"
 #include "json/json_entities.h"

haversine_02/src/profiler/timer.c

@@ -7,7 +7,6 @@
 
 #include <x86intrin.h>
 
-#if defined(BASIC_PROFILING) || defined(FULL_PROFILING)
 typedef struct {
   profiler_sample_t samples[MAX_PROFILE_SAMPLES];
   u64 cpu_freq;
@@ -83,6 +82,10 @@ void profile_end() {
 
   u16 time_precision = 16;
   u16 time_char_count = 20;
+  u16 duration_char_count = 22;
+  u16 hits_char_count = 10;
+  u16 percentage_precision = 8;
+  u16 percentage_char_count = 12;
 
   // clang-format off
   printf("\n==============================PROFILING==============================\n");
@@ -94,12 +97,6 @@ void profile_end() {
            (unsigned long long)profiler.cpu_freq);
   }
 
-#ifdef FULL_PROFILING
-  u16 duration_char_count = 22;
-  u16 hits_char_count = 10;
-  u16 percentage_precision = 8;
-  u16 percentage_char_count = 12;
-
   profiler_sample_t *sample = NULL;
 
   for (u64 i = 0; i < profiler.size; ++i) {
@@ -124,11 +121,8 @@ void profile_end() {
 
     printf(")\n");
   }
-#endif // FULL_PROFILING
 }
-#endif // BASIC_PROFILING || FULL_PROFILING
 
-#ifdef FULL_PROFILING
 void sample_start(u64 id, const char *title) {
   if (id >= MAX_PROFILE_SAMPLES) {
     return;
@@ -194,16 +188,15 @@ void sample_end(u64 id) {
   profiler_sample_t *parent = sample->parent;
 
   if (parent) {
+    sample->parent->start = now;
+
     // Add sample duration to all parents. This handles deep call stacks
     while (parent) {
       parent->children_time += duration;
 
       parent = parent->parent;
     }
-
-    sample->parent->start = now;
   }
 
   profiler.active = sample->parent;
 }
-#endif // FULL_PROFILING