From e60d5b3fe82398fef8dfd924a35b32e3efbc4cd7 Mon Sep 17 00:00:00 2001 From: Dzmitry Malyshau Date: Thu, 26 Jul 2018 22:17:39 -0400 Subject: [PATCH] Add new benchmarks, fix benching command line --- Cargo.lock | 16 ++++++++-------- Makefile | 2 +- bench/dota-2core-level1.csv | 7 +++++++ ...dota-2core-high.csv => dota-2core-level3.csv} | 9 +++++---- bench/dota-2core-low.csv | 7 ------- 5 files changed, 21 insertions(+), 20 deletions(-) create mode 100644 bench/dota-2core-level1.csv rename bench/{dota-2core-high.csv => dota-2core-level3.csv} (72%) delete mode 100644 bench/dota-2core-low.csv diff --git a/Cargo.lock b/Cargo.lock index 12a9033..2bcf8be 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -278,7 +278,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "gfx-backend-dx11" version = "0.1.0" -source = "git+https://github.com/gfx-rs/gfx#172a851bafa18d46887d2f3ae833cbfd56e192db" +source = "git+https://github.com/gfx-rs/gfx#e8254cd745f050587a80b13418d03a9702a1bfdf" dependencies = [ "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "derivative 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -294,7 +294,7 @@ dependencies = [ [[package]] name = "gfx-backend-dx12" version = "0.1.0" -source = "git+https://github.com/gfx-rs/gfx#172a851bafa18d46887d2f3ae833cbfd56e192db" +source = "git+https://github.com/gfx-rs/gfx#e8254cd745f050587a80b13418d03a9702a1bfdf" dependencies = [ "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "derivative 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -310,7 +310,7 @@ dependencies = [ [[package]] name = "gfx-backend-metal" version = "0.1.0" -source = "git+https://github.com/gfx-rs/gfx#172a851bafa18d46887d2f3ae833cbfd56e192db" +source = "git+https://github.com/gfx-rs/gfx#e8254cd745f050587a80b13418d03a9702a1bfdf" dependencies = [ "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "block 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -320,7 +320,7 @@ dependencies = [ "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "gfx-hal 0.1.0 (git+https://github.com/gfx-rs/gfx)", "log 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", - "metal-rs 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)", + "metal-rs 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)", "objc 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -332,7 +332,7 @@ dependencies = [ [[package]] name = "gfx-backend-vulkan" version = "0.1.0" -source = "git+https://github.com/gfx-rs/gfx#172a851bafa18d46887d2f3ae833cbfd56e192db" +source = "git+https://github.com/gfx-rs/gfx#e8254cd745f050587a80b13418d03a9702a1bfdf" dependencies = [ "ash 0.24.4 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -349,7 +349,7 @@ dependencies = [ [[package]] name = "gfx-hal" version = "0.1.0" -source = "git+https://github.com/gfx-rs/gfx#172a851bafa18d46887d2f3ae833cbfd56e192db" +source = "git+https://github.com/gfx-rs/gfx#e8254cd745f050587a80b13418d03a9702a1bfdf" dependencies = [ "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -486,7 +486,7 @@ dependencies = [ [[package]] name = "metal-rs" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1168,7 +1168,7 @@ dependencies = [ "checksum malloc_buf 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" "checksum memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "796fba70e76612589ed2ce7f45282f5af869e0fdd7cc6199fa1aa1f1d591ba9d" "checksum memmap 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e2ffa2c986de11a9df78620c01eeaaf27d94d3ff02bf81bfcca953102dd0c6ff" -"checksum metal-rs 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9a0172adc3697c4cc194d8a96bc6cb89a5ae64551330107d525d3928cf0544a0" +"checksum metal-rs 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)" = "6d1249c89974a91fe6377be7f95d8b6a1f8e50181032c7791f1bc086215617c9" "checksum nix 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d37e713a259ff641624b6cb20e3b12b2952313ba36b6823c0f16e6cfd9e5de17" "checksum objc 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "9833ab0efe5361b1e2122a0544a5d3359576911a42cb098c2e59be8650807367" "checksum objc-foundation 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" diff --git a/Makefile b/Makefile index bfb2ab9..e70afad 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ DOTA_EXE=$(DOTA_DIR)/dota2.app/Contents/MacOS/dota2 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_BENCHMARK=+timedemoquit +timedemo $(DOTA_DEMO_PHORONIX) +timedemo_start 40000 +timedemo_end 50000 +fps_max 0 -novconsole -high -autoconfig_level 1 DOTA_BENCH_RESULTS=../dota2/dota/Source2Bench.csv RUST_BACKTRACE:=1 diff --git a/bench/dota-2core-level1.csv b/bench/dota-2core-level1.csv new file mode 100644 index 0000000..4acfb84 --- /dev/null +++ b/bench/dota-2core-level1.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.3, 5.5,220.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 +timedemoquit +timedemo /Users/dmalyshau/Code/portability/../dota2/demos/dota2-pts-1971360796.dem +timedemo_start 40000 +timedemo_end 50000 +fps_max 0 -novconsole -autoconfig_level 1 -low -gl,OpenGL UNKNOWN (01024506),0x8086,0x1927,RENDER_SYSTEM_DLL_GL,enabled,3,2, +/Users/dmalyshau/Code/portability/../dota2/demos/dota2-pts-1971360796.dem,UNKNOWN, 45.7, 5.6,218.8,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 1 -low -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, 39.1, 5.0,255.7,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 1 -low -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, 42.2, 5.7,237.0,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 1 -low -vulkan_disable_occlusion_queries,Intel(R) Iris(TM) Graphics 550,0x8086,0x1927,RENDER_SYSTEM_DLL_VULKAN,enabled,3,2, diff --git a/bench/dota-2core-high.csv b/bench/dota-2core-level3.csv similarity index 72% rename from bench/dota-2core-high.csv rename to bench/dota-2core-level3.csv index be23915..5b6ddb0 100644 --- a/bench/dota-2core-high.csv +++ b/bench/dota-2core-level3.csv @@ -1,7 +1,8 @@ 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, +/Users/dmalyshau/Code/portability/../dota2/demos/dota2-pts-1971360796.dem,UNKNOWN, 36.0, 5.6,277.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,0x8086,0x1927,RENDER_SYSTEM_DLL_VULKAN,enabled,3,2, +/Users/dmalyshau/Code/portability/../dota2/demos/dota2-pts-1971360796.dem,UNKNOWN, 34.7, 6.8,287.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 +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, 32.8, 4.3,304.8,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, 38.7, 5.3,258.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,0x0,0x0,RENDER_SYSTEM_DLL_VULKAN,enabled,3,2, +/Users/dmalyshau/Code/portability/../dota2/demos/dota2-pts-1971360796.dem,UNKNOWN, 36.5, 5.2,273.7,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, diff --git a/bench/dota-2core-low.csv b/bench/dota-2core-low.csv deleted file mode 100644 index 6136412..0000000 --- a/bench/dota-2core-low.csv +++ /dev/null @@ -1,7 +0,0 @@ -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,