First draw of a Benchmarking framework

ARM-software · Sep 19, 2024 · 9089c13 · 9089c13
1 parent 681a117
commit 9089c13
Show file tree

Hide file tree

Showing 44 changed files with 1,256 additions and 122 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,10 +1,9 @@
 cmake_minimum_required(VERSION 3.13)
-set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_CXX_STANDARD_REQUIRED YES)
 enable_testing()
 project(tracetooltests)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
 set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED YES)
 
 if(NOT DEFINED WINDOWSYSTEM) # to prevent overwriting toolchain setting
 	set(WINDOWSYSTEM "x11" CACHE STRING "Window system to use for build")
@@ -48,7 +47,8 @@ set(SYMLINK_DIR "$ENV{HOME}/.local/share/benchmarking")
 install(DIRECTORY DESTINATION "${SYMLINK_DIR}")
 
 function(gles_test test_name)
-	add_executable(gles_${ARGV0} src/util.cpp src/util.h src/gles_${ARGV0}.cpp src/gles_common.cpp src/gles_common.h)
+	add_executable(gles_${ARGV0} src/util.cpp src/util.h src/gles_${ARGV0}.cpp src/gles_common.cpp src/gles_common.h
+		src/benchmarking/generated_benchmarking.hpp src/benchmarking/generated_benchmarking.cpp src/benchmarking/benchmarking.hpp src/benchmarking/benchmarking.cpp)
 	target_link_libraries(gles_${ARGV0} PRIVATE -Wl,--add-needed EGL GLESv2 pthread ${IT_LIBS})
 	target_link_directories(gles_${ARGV0} PRIVATE ${API_LIBS})
 	target_compile_definitions(gles_${ARGV0} PUBLIC ${IT_DEFINES})
@@ -63,7 +63,8 @@ endfunction()
 
 function(vulkan_test_build test_name)
 	add_executable(vulkan_${ARGV0} src/vulkan_${ARGV0}.cpp src/vulkan_common.cpp src/vulkan_common.h src/vulkan_compute_common.cpp src/vulkan_compute_common.h
-		src/vulkan_window_common.cpp src/vulkan_window_common.h src/util.cpp src/util.h)
+		src/vulkan_window_common.cpp src/vulkan_window_common.h src/util.cpp src/util.h
+		src/benchmarking/generated_benchmarking.hpp src/benchmarking/generated_benchmarking.cpp src/benchmarking/benchmarking.hpp src/benchmarking/benchmarking.cpp)
 	target_link_libraries(vulkan_${ARGV0} PRIVATE vulkan pthread ${IT_LIBS} ${XCB_LIBRARIES})
 	target_link_directories(vulkan_${ARGV0} PRIVATE ${API_LIBS})
 	target_compile_definitions(vulkan_${ARGV0} PUBLIC ${IT_DEFINES})

diff --git a/benchmarking/vulkan_as_1.bench b/benchmarking/vulkan_as_1.bench
@@ -5,7 +5,8 @@
 		"vulkan_variant": {
 			"description": "Set Vulkan variant",
 			"type": "selection",
-			"options": [ "1.0", "1.1", "1.2", "1.3" ]
+			"options": [ "1.0", "1.1", "1.2", "1.3" ],
+			"default": "1.0"
 		}
 	},
 	"capabilities": {

diff --git a/benchmarking/vulkan_as_2.bench b/benchmarking/vulkan_as_2.bench
@@ -5,7 +5,8 @@
 		"vulkan_variant": {
 			"description": "Set Vulkan variant",
 			"type": "selection",
-			"options": [ "1.0", "1.1", "1.2", "1.3" ]
+			"options": [ "1.0", "1.1", "1.2", "1.3" ],
+			"default": "1.0"
 		}
 	},
 	"capabilities": {

diff --git a/benchmarking/vulkan_as_3.bench b/benchmarking/vulkan_as_3.bench
@@ -5,7 +5,8 @@
 		"vulkan_variant": {
 			"description": "Set Vulkan variant",
 			"type": "selection",
-			"options": [ "1.0", "1.1", "1.2", "1.3" ]
+			"options": [ "1.0", "1.1", "1.2", "1.3" ],
+			"default": "1.0"
 		}
 	},
 	"capabilities": {

diff --git a/benchmarking/vulkan_as_4.bench b/benchmarking/vulkan_as_4.bench
@@ -5,7 +5,8 @@
 		"vulkan_variant": {
 			"description": "Set Vulkan variant",
 			"type": "selection",
-			"options": [ "1.0", "1.1", "1.2", "1.3" ]
+			"options": [ "1.0", "1.1", "1.2", "1.3" ],
+			"default": "1.0"
 		}
 	},
 	"capabilities": {

diff --git a/benchmarking/vulkan_as_5.bench b/benchmarking/vulkan_as_5.bench
@@ -5,7 +5,8 @@
 		"vulkan_variant": {
 			"description": "Set Vulkan variant",
 			"type": "selection",
-			"options": [ "1.0", "1.1", "1.2", "1.3" ]
+			"options": [ "1.0", "1.1", "1.2", "1.3" ],
+			"default": "1.0"
 		}
 	},
 	"capabilities": {

diff --git a/benchmarking/vulkan_compute_1.bench b/benchmarking/vulkan_compute_1.bench
@@ -5,7 +5,8 @@
 		"vulkan_variant": {
 			"description": "Set Vulkan variant",
 			"type": "selection",
-			"options": [ "1.0", "1.1", "1.2", "1.3" ]
+			"options": [ "1.0", "1.1", "1.2", "1.3" ],
+			"default": "1.0"
 		}
 	},
 	"capabilities": {

diff --git a/benchmarking/vulkan_compute_2.bench b/benchmarking/vulkan_compute_2.bench
@@ -5,7 +5,8 @@
 		"vulkan_variant": {
 			"description": "Set Vulkan variant",
 			"type": "selection",
-			"options": [ "1.0", "1.1", "1.2", "1.3" ]
+			"options": [ "1.0", "1.1", "1.2", "1.3" ],
+			"default": "1.0"
 		}
 	},
 	"capabilities": {

diff --git a/benchmarking/vulkan_compute_3.bench b/benchmarking/vulkan_compute_3.bench
@@ -5,7 +5,8 @@
 		"vulkan_variant": {
 			"description": "Set Vulkan variant",
 			"type": "selection",
-			"options": [ "1.0", "1.1", "1.2", "1.3" ]
+			"options": [ "1.0", "1.1", "1.2", "1.3" ],
+			"default": "1.0"
 		}
 	},
 	"capabilities": {

diff --git a/benchmarking/vulkan_compute_aliasing.bench b/benchmarking/vulkan_compute_aliasing.bench
@@ -5,7 +5,8 @@
 		"vulkan_variant": {
 			"description": "Set Vulkan variant",
 			"type": "selection",
-			"options": [ "1.0", "1.1", "1.2", "1.3" ]
+			"options": [ "1.0", "1.1", "1.2", "1.3" ],
+			"default": "1.0"
 		}
 	},
 	"capabilities": {

diff --git a/benchmarking/vulkan_compute_bda_pushconstant.bench b/benchmarking/vulkan_compute_bda_pushconstant.bench
@@ -5,7 +5,8 @@
 		"vulkan_variant": {
 			"description": "Set Vulkan variant",
 			"type": "selection",
-			"options": [ "1.0", "1.1", "1.2", "1.3" ]
+			"options": [ "1.0", "1.1", "1.2", "1.3" ],
+			"default": "1.0"
 		}
 	},
 	"capabilities": {

diff --git a/benchmarking/vulkan_compute_bda_sc.bench b/benchmarking/vulkan_compute_bda_sc.bench
@@ -5,7 +5,8 @@
 		"vulkan_variant": {
 			"description": "Set Vulkan variant",
 			"type": "selection",
-			"options": [ "1.0", "1.1", "1.2", "1.3" ]
+			"options": [ "1.0", "1.1", "1.2", "1.3" ],
+			"default": "1.0"
 		}
 	},
 	"capabilities": {

diff --git a/benchmarking/vulkan_copying_1.bench b/benchmarking/vulkan_copying_1.bench
@@ -5,7 +5,8 @@
 		"vulkan_variant": {
 			"description": "Set Vulkan variant",
 			"type": "selection",
-			"options": [ "1.0", "1.1", "1.2", "1.3" ]
+			"options": [ "1.0", "1.1", "1.2", "1.3" ],
+			"default": "1.0"
 		}
 	},
 	"capabilities": {

diff --git a/benchmarking/vulkan_copying_2.bench b/benchmarking/vulkan_copying_2.bench
@@ -5,7 +5,8 @@
 		"vulkan_variant": {
 			"description": "Set Vulkan variant",
 			"type": "selection",
-			"options": [ "1.0", "1.1", "1.2", "1.3" ]
+			"options": [ "1.0", "1.1", "1.2", "1.3" ],
+			"default": "1.0"
 		}
 	},
 	"capabilities": {

diff --git a/benchmarking/vulkan_copying_3.bench b/benchmarking/vulkan_copying_3.bench
@@ -5,7 +5,8 @@
 		"vulkan_variant": {
 			"description": "Set Vulkan variant",
 			"type": "selection",
-			"options": [ "1.0", "1.1", "1.2", "1.3" ]
+			"options": [ "1.0", "1.1", "1.2", "1.3" ],
+			"default": "1.0"
 		}
 	},
 	"capabilities": {

diff --git a/benchmarking/vulkan_debug_marker.bench b/benchmarking/vulkan_debug_marker.bench
@@ -5,7 +5,8 @@
 		"vulkan_variant": {
 			"description": "Set Vulkan variant",
 			"type": "selection",
-			"options": [ "1.0", "1.1", "1.2", "1.3" ]
+			"options": [ "1.0", "1.1", "1.2", "1.3" ],
+			"default": "1.0"
 		}
 	},
 	"capabilities": {

diff --git a/benchmarking/vulkan_debug_report.bench b/benchmarking/vulkan_debug_report.bench
@@ -5,7 +5,8 @@
 		"vulkan_variant": {
 			"description": "Set Vulkan variant",
 			"type": "selection",
-			"options": [ "1.0", "1.1", "1.2", "1.3" ]
+			"options": [ "1.0", "1.1", "1.2", "1.3" ],
+			"default": "1.0"
 		}
 	},
 	"capabilities": {

diff --git a/benchmarking/vulkan_feature_1.bench b/benchmarking/vulkan_feature_1.bench
@@ -5,7 +5,8 @@
 		"vulkan_variant": {
 			"description": "Set Vulkan variant",
 			"type": "selection",
-			"options": [ "1.0", "1.1", "1.2", "1.3" ]
+			"options": [ "1.0", "1.1", "1.2", "1.3" ],
+			"default": "1.0"
 		}
 	},
 	"capabilities": {

diff --git a/benchmarking/vulkan_feature_2.bench b/benchmarking/vulkan_feature_2.bench
@@ -5,7 +5,8 @@
 		"vulkan_variant": {
 			"description": "Set Vulkan variant",
 			"type": "selection",
-			"options": [ "1.0", "1.1", "1.2", "1.3" ]
+			"options": [ "1.0", "1.1", "1.2", "1.3" ],
+			"default": "1.0"
 		}
 	},
 	"capabilities": {

diff --git a/benchmarking/vulkan_general.bench b/benchmarking/vulkan_general.bench
@@ -5,7 +5,8 @@
 		"vulkan_variant": {
 			"description": "Set Vulkan variant",
 			"type": "selection",
-			"options": [ "1.0", "1.1", "1.2", "1.3" ]
+			"options": [ "1.0", "1.1", "1.2", "1.3" ],
+			"default": "1.0"
 		}
 	},
 	"capabilities": {

diff --git a/benchmarking/vulkan_init.bench b/benchmarking/vulkan_init.bench
@@ -5,7 +5,8 @@
 		"vulkan_variant": {
 			"description": "Set Vulkan variant",
 			"type": "selection",
-			"options": [ "1.0", "1.1", "1.2", "1.3" ]
+			"options": [ "1.0", "1.1", "1.2", "1.3" ],
+			"default": "1.0"
 		}
 	},
 	"capabilities": {

diff --git a/benchmarking/vulkan_memory_1.bench b/benchmarking/vulkan_memory_1.bench
@@ -5,7 +5,8 @@
 		"vulkan_variant": {
 			"description": "Set Vulkan variant",
 			"type": "selection",
-			"options": [ "1.0", "1.1", "1.2", "1.3" ]
+			"options": [ "1.0", "1.1", "1.2", "1.3" ],
+			"default": "1.0"
 		}
 	},
 	"capabilities": {

diff --git a/benchmarking/vulkan_memory_1_1.bench b/benchmarking/vulkan_memory_1_1.bench
@@ -5,7 +5,8 @@
 		"vulkan_variant": {
 			"description": "Set Vulkan variant",
 			"type": "selection",
-			"options": [ "1.0", "1.1", "1.2", "1.3" ]
+			"options": [ "1.0", "1.1", "1.2", "1.3" ],
+			"default": "1.0"
 		}
 	},
 	"capabilities": {

diff --git a/benchmarking/vulkan_multidevice_1.bench b/benchmarking/vulkan_multidevice_1.bench
@@ -5,7 +5,8 @@
 		"vulkan_variant": {
 			"description": "Set Vulkan variant",
 			"type": "selection",
-			"options": [ "1.0", "1.1", "1.2", "1.3" ]
+			"options": [ "1.0", "1.1", "1.2", "1.3" ],
+			"default": "1.0"
 		}
 	},
 	"capabilities": {

diff --git a/benchmarking/vulkan_multiinstance.bench b/benchmarking/vulkan_multiinstance.bench
@@ -5,7 +5,8 @@
 		"vulkan_variant": {
 			"description": "Set Vulkan variant",
 			"type": "selection",
-			"options": [ "1.0", "1.1", "1.2", "1.3" ]
+			"options": [ "1.0", "1.1", "1.2", "1.3" ],
+			"default": "1.0"
 		}
 	},
 	"capabilities": {

diff --git a/benchmarking/vulkan_pipelinecache_1.bench b/benchmarking/vulkan_pipelinecache_1.bench
@@ -5,7 +5,8 @@
 		"vulkan_variant": {
 			"description": "Set Vulkan variant",
 			"type": "selection",
-			"options": [ "1.0", "1.1", "1.2", "1.3" ]
+			"options": [ "1.0", "1.1", "1.2", "1.3" ],
+			"default": "1.0"
 		}
 	},
 	"capabilities": {

diff --git a/benchmarking/vulkan_pnext_chain.bench b/benchmarking/vulkan_pnext_chain.bench
@@ -5,7 +5,8 @@
 		"vulkan_variant": {
 			"description": "Set Vulkan variant",
 			"type": "selection",
-			"options": [ "1.0", "1.1", "1.2", "1.3" ]
+			"options": [ "1.0", "1.1", "1.2", "1.3" ],
+			"default": "1.0"
 		}
 	},
 	"capabilities": {

diff --git a/benchmarking/vulkan_stress_1.bench b/benchmarking/vulkan_stress_1.bench
@@ -5,7 +5,8 @@
 		"vulkan_variant": {
 			"description": "Set Vulkan variant",
 			"type": "selection",
-			"options": [ "1.0", "1.1", "1.2", "1.3" ]
+			"options": [ "1.0", "1.1", "1.2", "1.3" ],
+			"default": "1.0"
 		}
 	},
 	"capabilities": {

diff --git a/benchmarking/vulkan_thread_1.bench b/benchmarking/vulkan_thread_1.bench
@@ -5,7 +5,8 @@
 		"vulkan_variant": {
 			"description": "Set Vulkan variant",
 			"type": "selection",
-			"options": [ "1.0", "1.1", "1.2", "1.3" ]
+			"options": [ "1.0", "1.1", "1.2", "1.3" ],
+			"default": "1.0"
 		}
 	},
 	"capabilities": {

diff --git a/benchmarking/vulkan_thread_2.bench b/benchmarking/vulkan_thread_2.bench
@@ -5,7 +5,8 @@
 		"vulkan_variant": {
 			"description": "Set Vulkan variant",
 			"type": "selection",
-			"options": [ "1.0", "1.1", "1.2", "1.3" ]
+			"options": [ "1.0", "1.1", "1.2", "1.3" ],
+			"default": "1.0"
 		}
 	},
 	"capabilities": {

diff --git a/benchmarking/vulkan_thread_3.bench b/benchmarking/vulkan_thread_3.bench
@@ -5,7 +5,8 @@
 		"vulkan_variant": {
 			"description": "Set Vulkan variant",
 			"type": "selection",
-			"options": [ "1.0", "1.1", "1.2", "1.3" ]
+			"options": [ "1.0", "1.1", "1.2", "1.3" ],
+			"default": "1.0"
 		}
 	},
 	"capabilities": {

diff --git a/benchmarking/vulkan_tool_1.bench b/benchmarking/vulkan_tool_1.bench
@@ -5,7 +5,8 @@
 		"vulkan_variant": {
 			"description": "Set Vulkan variant",
 			"type": "selection",
-			"options": [ "1.0", "1.1", "1.2", "1.3" ]
+			"options": [ "1.0", "1.1", "1.2", "1.3" ],
+			"default": "1.0"
 		}
 	},
 	"capabilities": {

diff --git a/benchmarking/vulkan_xfb.bench b/benchmarking/vulkan_xfb.bench
@@ -5,7 +5,8 @@
 		"vulkan_variant": {
 			"description": "Set Vulkan variant",
 			"type": "selection",
-			"options": [ "1.0", "1.1", "1.2", "1.3" ]
+			"options": [ "1.0", "1.1", "1.2", "1.3" ],
+			"default": "1.0"
 		}
 	},
 	"capabilities": {