diff --git a/include/private/vkd3d_profiling.h b/include/private/vkd3d_profiling.h index 9983dd1e..a784dfc0 100644 --- a/include/private/vkd3d_profiling.h +++ b/include/private/vkd3d_profiling.h @@ -25,13 +25,6 @@ #ifdef VKD3D_ENABLE_PROFILING -#ifdef _WIN32 -#define WIN32_LEAN_AND_MEAN -#include -#else -#include -#endif - void vkd3d_init_profiling(void); bool vkd3d_uses_profiling(void); unsigned int vkd3d_profiling_register_region(const char *name, spinlock_t *lock, uint32_t *latch); @@ -48,12 +41,12 @@ void vkd3d_profiling_notify_work(unsigned int index, uint64_t start_ticks, uint6 do { \ if (!(_vkd3d_region_index_##name = vkd3d_atomic_uint32_load_explicit(&_vkd3d_region_latch_##name, vkd3d_memory_order_acquire))) \ _vkd3d_region_index_##name = vkd3d_profiling_register_region(#name, &_vkd3d_region_lock_##name, &_vkd3d_region_latch_##name); \ - _vkd3d_region_begin_tick_##name = vkd3d_get_current_time_ns(); \ + _vkd3d_region_begin_tick_##name = vkd3d_get_current_time_ticks(); \ } while(0) #define VKD3D_REGION_END_ITERATIONS(name, iter) \ do { \ - _vkd3d_region_end_tick_##name = vkd3d_get_current_time_ns(); \ + _vkd3d_region_end_tick_##name = vkd3d_get_current_time_ticks(); \ vkd3d_profiling_notify_work(_vkd3d_region_index_##name, _vkd3d_region_begin_tick_##name, _vkd3d_region_end_tick_##name, iter); \ } while(0) diff --git a/programs/vkd3d-profile.py b/programs/vkd3d-profile.py index 728af9c5..e978127a 100644 --- a/programs/vkd3d-profile.py +++ b/programs/vkd3d-profile.py @@ -114,11 +114,11 @@ def main(): print(' Iterations:', block.iterations) if args.divider is not None: - print(' Time spent per iteration of {}: {:.3f}'.format(args.divider, block.ticks / 1000.0), "us") + print(' Time spent per iteration of {}: {:.3f}'.format(args.divider, block.ticks / 1000.0), "Kcycles") elif args.per_iteration: - print(' Time spent per iteration: {:.3f}'.format(block.ticks / 1000.0), "us") + print(' Time spent per iteration: {:.3f}'.format(block.ticks / 1000.0), "Kcycles") else: - print(' Total time spent: {:.3f}'.format(block.ticks / 1000.0), "us") + print(' Total time spent: {:.3f}'.format(block.ticks / 1000.0), "Kcycles") if __name__ == '__main__': main()