diff --git a/Makefile b/Makefile index 0478379..bfb2ab9 100644 --- a/Makefile +++ b/Makefile @@ -10,11 +10,15 @@ TEST_LIST=$(CURDIR)/conformance/deqp.txt TEST_LIST_SOURCE=$(CTS_DIR)/external/vulkancts/mustpass/1.0.2/vk-default.txt DEQP_DIR=$(CTS_DIR)/build/external/vulkancts/modules/vulkan/ DEQP=cd $(DEQP_DIR) && RUST_LOG=debug LD_LIBRARY_PATH=$(FULL_LIBRARY_PATH) ./deqp-vk + DOTA_DIR=../dota2/bin/osx64 DOTA_EXE=$(DOTA_DIR)/dota2.app/Contents/MacOS/dota2 #possible command lines are : -vulkan_disable_occlusion_queries -vulkan_scene_system_job_cost 2 +vulkan_batch_submits 1 +vulkan_batch_size 500 DOTA_PARAMS_GFX=-vulkan_disable_occlusion_queries DOTA_PARAMS_MOLTEN=-vulkan_disable_occlusion_queries +DOTA_DEMO_PHORONIX= "$(CURDIR)/../dota2/demos/dota2-pts-1971360796.dem" +DOTA_BENCHMARK=+timedemoquit +timedemo $(DOTA_DEMO_PHORONIX) +timedemo_start 40000 +timedemo_end 50000 +fps_max 0 -novconsole -autoconfig_level 1 -low +DOTA_BENCH_RESULTS=../dota2/dota/Source2Bench.csv RUST_BACKTRACE:=1 BACKEND:=gl @@ -66,19 +70,30 @@ version-debug: version-release: cargo rustc --release --manifest-path libportability/Cargo.toml --features $(BACKEND) -- -Clink-arg="-current_version 1.0.0" -Clink-arg="-compatibility_version 1.0.0" + dota-debug: version-debug $(DOTA_EXE) echo "env DYLD_LIBRARY_PATH=$(CURDIR)/target/debug:$(CURDIR)/$(DOTA_DIR)" >.lldbinit DYLD_LIBRARY_PATH=$(CURDIR)/target/debug:$(CURDIR)/$(DOTA_DIR) $(DEBUGGER) $(DOTA_EXE) $(DOTA_PARAMS_GFX) dota-release: version-release $(DOTA_EXE) DYLD_LIBRARY_PATH=$(CURDIR)/target/release:$(CURDIR)/$(DOTA_DIR) $(DOTA_EXE) $(DOTA_PARAMS_GFX) -dota-molten: +dota-molten: $(DOTA_EXE) DYLD_LIBRARY_PATH=$(CURDIR)/../MoltenVK/Package/Release/MoltenVK/macOS:$(CURDIR)/$(DOTA_DIR) $(DOTA_EXE) $(DOTA_PARAMS_MOLTEN) -dota-orig: +dota-orig: $(DOTA_EXE) DYLD_LIBRARY_PATH=$(CURDIR)/$(DOTA_DIR) $(DOTA_EXE) $(DOTA_PARAMS_MOLTEN) -dota-orig-gl: +dota-orig-gl: $(DOTA_EXE) DYLD_LIBRARY_PATH=$(CURDIR)/$(DOTA_DIR) $(DOTA_EXE) -gl +dota-bench-gfx: version-release $(DOTA_EXE) + DYLD_LIBRARY_PATH=$(CURDIR)/target/release:$(CURDIR)/$(DOTA_DIR) $(DOTA_EXE) $(DOTA_BENCHMARK) $(DOTA_PARAMS_GFX) + +dota-bench-orig: $(DOTA_EXE) + DYLD_LIBRARY_PATH=$(CURDIR)/$(DOTA_DIR) $(DOTA_EXE) $(DOTA_BENCHMARK) $(DOTA_PARAMS_MOLTEN) + +dota-bench-gl: $(DOTA_EXE) + DYLD_LIBRARY_PATH=$(CURDIR)/target/release:$(CURDIR)/$(DOTA_DIR) $(DOTA_EXE) $(DOTA_BENCHMARK) -gl + + binding: $(BINDING) $(BINDING): $(VULKAN_DIR)/vulkan/*.h diff --git a/bench/dota-2core-high.csv b/bench/dota-2core-high.csv new file mode 100644 index 0000000..be23915 --- /dev/null +++ b/bench/dota-2core-high.csv @@ -0,0 +1,7 @@ +Source2 Benchmark Results + +demofile,frame data csv,fps,fps variability,total sec,width,height,numframes,dxlevel,backbuffer,cmdline,driver,vendor id,device id,rendersystemdll,sound,gpu_level,cpu_level, +/Users/dmalyshau/Code/portability/../dota2/demos/dota2-pts-1971360796.dem,UNKNOWN, 35.2, 5.7,284.1,1440,900,9999,110,RGBA8888,"/Users/dmalyshau/Code/dota2/bin/osx64/dota2.app/Contents/MacOS/dota2" ../dota2/bin/osx64/dota2.app/Contents/MacOS/dota2 +timedemoquit +timedemo /Users/dmalyshau/Code/portability/../dota2/demos/dota2-pts-1971360796.dem +timedemo_start 40000 +timedemo_end 50000 +fps_max 0 -novconsole -autoconfig_level 3 -high -vulkan_disable_occlusion_queries,Intel(R) Iris(TM) Graphics 550,0x8086,0x1927,RENDER_SYSTEM_DLL_VULKAN,enabled,3,2, +/Users/dmalyshau/Code/portability/../dota2/demos/dota2-pts-1971360796.dem,UNKNOWN, 33.9, 6.8,295.3,1440,900,9999,110,RGBA8888,"/Users/dmalyshau/Code/dota2/bin/osx64/dota2.app/Contents/MacOS/dota2" ../dota2/bin/osx64/dota2.app/Contents/MacOS/dota2 +timedemoquit +timedemo /Users/dmalyshau/Code/portability/../dota2/demos/dota2-pts-1971360796.dem +timedemo_start 40000 +timedemo_end 50000 +fps_max 0 -novconsole -autoconfig_level 3 -high -gl,OpenGL UNKNOWN (01024506),0x8086,0x1927,RENDER_SYSTEM_DLL_GL,enabled,3,2, +/Users/dmalyshau/Code/portability/../dota2/demos/dota2-pts-1971360796.dem,UNKNOWN, 31.0, 4.5,322.5,1440,900,9999,110,RGBA8888,"/Users/dmalyshau/Code/dota2/bin/osx64/dota2.app/Contents/MacOS/dota2" ../dota2/bin/osx64/dota2.app/Contents/MacOS/dota2 +timedemoquit +timedemo /Users/dmalyshau/Code/portability/../dota2/demos/dota2-pts-1971360796.dem +timedemo_start 40000 +timedemo_end 50000 +fps_max 0 -novconsole -autoconfig_level 3 -high -vulkan_disable_occlusion_queries,Intel(R) Iris(TM) Graphics 550,0x0,0x0,RENDER_SYSTEM_DLL_VULKAN,enabled,3,2, +/Users/dmalyshau/Code/portability/../dota2/demos/dota2-pts-1971360796.dem,UNKNOWN, 36.2, 5.3,276.4,1440,900,9999,110,RGBA8888,"/Users/dmalyshau/Code/dota2/bin/osx64/dota2.app/Contents/MacOS/dota2" ../dota2/bin/osx64/dota2.app/Contents/MacOS/dota2 +timedemoquit +timedemo /Users/dmalyshau/Code/portability/../dota2/demos/dota2-pts-1971360796.dem +timedemo_start 40000 +timedemo_end 50000 +fps_max 0 -novconsole -autoconfig_level 3 -high -vulkan_disable_occlusion_queries,Intel(R) Iris(TM) Graphics 550,0x0,0x0,RENDER_SYSTEM_DLL_VULKAN,enabled,3,2, diff --git a/bench/dota-2core-low.csv b/bench/dota-2core-low.csv new file mode 100644 index 0000000..6136412 --- /dev/null +++ b/bench/dota-2core-low.csv @@ -0,0 +1,7 @@ +Source2 Benchmark Results + +demofile,frame data csv,fps,fps variability,total sec,width,height,numframes,dxlevel,backbuffer,cmdline,driver,vendor id,device id,rendersystemdll,sound,gpu_level,cpu_level, +/Users/dmalyshau/Code/portability/../dota2/demos/dota2-pts-1971360796.dem,UNKNOWN, 45.6, 5.7,219.3,1440,900,9999,110,RGBA8888,"/Users/dmalyshau/Code/dota2/bin/osx64/dota2.app/Contents/MacOS/dota2" ../dota2/bin/osx64/dota2.app/Contents/MacOS/dota2 +fps_max 0 -console -novconsole -autoconfig_level 1 -low +timedemo /Users/dmalyshau/Code/portability/../dota2/demos/dota2-pts-1971360796.dem +timedemo_start 40000 +timedemo_end 50000 -gl,OpenGL UNKNOWN (01024506),0x8086,0x1927,RENDER_SYSTEM_DLL_GL,enabled,3,2, +/Users/dmalyshau/Code/portability/../dota2/demos/dota2-pts-1971360796.dem,UNKNOWN, 37.0, 5.7,269.9,1440,900,9999,110,RGBA8888,"/Users/dmalyshau/Code/dota2/bin/osx64/dota2.app/Contents/MacOS/dota2" ../dota2/bin/osx64/dota2.app/Contents/MacOS/dota2 +fps_max 0 -console -novconsole -autoconfig_level 1 -low +timedemo /Users/dmalyshau/Code/portability/../dota2/demos/dota2-pts-1971360796.dem +timedemo_start 40000 +timedemo_end 50000 -vulkan_disable_occlusion_queries,Intel(R) Iris(TM) Graphics 550,0x0,0x0,RENDER_SYSTEM_DLL_VULKAN,enabled,3,2, +/Users/dmalyshau/Code/portability/../dota2/demos/dota2-pts-1971360796.dem,UNKNOWN, 44.4, 5.7,225.2,1440,900,9999,110,RGBA8888,"/Users/dmalyshau/Code/dota2/bin/osx64/dota2.app/Contents/MacOS/dota2" ../dota2/bin/osx64/dota2.app/Contents/MacOS/dota2 +fps_max 0 -console -novconsole -autoconfig_level 1 -low +timedemo /Users/dmalyshau/Code/portability/../dota2/demos/dota2-pts-1971360796.dem +timedemo_start 40000 +timedemo_end 50000 -vulkan_disable_occlusion_queries,Intel(R) Iris(TM) Graphics 550,0x0,0x0,RENDER_SYSTEM_DLL_VULKAN,enabled,3,2, +/Users/dmalyshau/Code/portability/../dota2/demos/dota2-pts-1971360796.dem,UNKNOWN, 41.7, 6.4,239.5,1440,900,9999,110,RGBA8888,"/Users/dmalyshau/Code/dota2/bin/osx64/dota2.app/Contents/MacOS/dota2" ../dota2/bin/osx64/dota2.app/Contents/MacOS/dota2 +fps_max 0 -console -novconsole -autoconfig_level 1 -low +timedemo /Users/dmalyshau/Code/portability/../dota2/demos/dota2-pts-1971360796.dem +timedemo_start 40000 +timedemo_end 50000 -vulkan_disable_occlusion_queries,Intel(R) Iris(TM) Graphics 550,0x8086,0x1927,RENDER_SYSTEM_DLL_VULKAN,enabled,3,2,