diff options
| author | 2016-09-18 09:38:01 +0900 | |
|---|---|---|
| committer | 2016-09-18 09:38:01 +0900 | |
| commit | dc8479928c5aee4c6ad6fe4f59006fb604cee701 (patch) | |
| tree | 569a7f13128450bbab973236615587ff00bced5f /src/core/tracer/recorder.cpp | |
| parent | Travis: Import Dolphin’s clang-format hook. (diff) | |
| download | yuzu-dc8479928c5aee4c6ad6fe4f59006fb604cee701.tar.gz yuzu-dc8479928c5aee4c6ad6fe4f59006fb604cee701.tar.xz yuzu-dc8479928c5aee4c6ad6fe4f59006fb604cee701.zip | |
Sources: Run clang-format on everything.
Diffstat (limited to 'src/core/tracer/recorder.cpp')
| -rw-r--r-- | src/core/tracer/recorder.cpp | 140 |
1 files changed, 82 insertions, 58 deletions
diff --git a/src/core/tracer/recorder.cpp b/src/core/tracer/recorder.cpp index 7abaacf70..8fd0018c4 100644 --- a/src/core/tracer/recorder.cpp +++ b/src/core/tracer/recorder.cpp | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | namespace CiTrace { | 13 | namespace CiTrace { |
| 14 | 14 | ||
| 15 | Recorder::Recorder(const InitialState& initial_state) : initial_state(initial_state) { | 15 | Recorder::Recorder(const InitialState& initial_state) : initial_state(initial_state) { |
| 16 | |||
| 17 | } | 16 | } |
| 18 | 17 | ||
| 19 | void Recorder::Finish(const std::string& filename) { | 18 | void Recorder::Finish(const std::string& filename) { |
| @@ -26,35 +25,41 @@ void Recorder::Finish(const std::string& filename) { | |||
| 26 | // Calculate file offsets | 25 | // Calculate file offsets |
| 27 | auto& initial = header.initial_state_offsets; | 26 | auto& initial = header.initial_state_offsets; |
| 28 | 27 | ||
| 29 | initial.gpu_registers_size = static_cast<u32>(initial_state.gpu_registers.size()); | 28 | initial.gpu_registers_size = static_cast<u32>(initial_state.gpu_registers.size()); |
| 30 | initial.lcd_registers_size = static_cast<u32>(initial_state.lcd_registers.size()); | 29 | initial.lcd_registers_size = static_cast<u32>(initial_state.lcd_registers.size()); |
| 31 | initial.pica_registers_size = static_cast<u32>(initial_state.pica_registers.size()); | 30 | initial.pica_registers_size = static_cast<u32>(initial_state.pica_registers.size()); |
| 32 | initial.default_attributes_size = static_cast<u32>(initial_state.default_attributes.size()); | 31 | initial.default_attributes_size = static_cast<u32>(initial_state.default_attributes.size()); |
| 33 | initial.vs_program_binary_size = static_cast<u32>(initial_state.vs_program_binary.size()); | 32 | initial.vs_program_binary_size = static_cast<u32>(initial_state.vs_program_binary.size()); |
| 34 | initial.vs_swizzle_data_size = static_cast<u32>(initial_state.vs_swizzle_data.size()); | 33 | initial.vs_swizzle_data_size = static_cast<u32>(initial_state.vs_swizzle_data.size()); |
| 35 | initial.vs_float_uniforms_size = static_cast<u32>(initial_state.vs_float_uniforms.size()); | 34 | initial.vs_float_uniforms_size = static_cast<u32>(initial_state.vs_float_uniforms.size()); |
| 36 | initial.gs_program_binary_size = static_cast<u32>(initial_state.gs_program_binary.size()); | 35 | initial.gs_program_binary_size = static_cast<u32>(initial_state.gs_program_binary.size()); |
| 37 | initial.gs_swizzle_data_size = static_cast<u32>(initial_state.gs_swizzle_data.size()); | 36 | initial.gs_swizzle_data_size = static_cast<u32>(initial_state.gs_swizzle_data.size()); |
| 38 | initial.gs_float_uniforms_size = static_cast<u32>(initial_state.gs_float_uniforms.size()); | 37 | initial.gs_float_uniforms_size = static_cast<u32>(initial_state.gs_float_uniforms.size()); |
| 39 | header.stream_size = static_cast<u32>(stream.size()); | 38 | header.stream_size = static_cast<u32>(stream.size()); |
| 40 | 39 | ||
| 41 | initial.gpu_registers = sizeof(header); | 40 | initial.gpu_registers = sizeof(header); |
| 42 | initial.lcd_registers = initial.gpu_registers + initial.gpu_registers_size * sizeof(u32); | 41 | initial.lcd_registers = initial.gpu_registers + initial.gpu_registers_size * sizeof(u32); |
| 43 | initial.pica_registers = initial.lcd_registers + initial.lcd_registers_size * sizeof(u32);; | 42 | initial.pica_registers = initial.lcd_registers + initial.lcd_registers_size * sizeof(u32); |
| 44 | initial.default_attributes = initial.pica_registers + initial.pica_registers_size * sizeof(u32); | 43 | ; |
| 45 | initial.vs_program_binary = initial.default_attributes + initial.default_attributes_size * sizeof(u32); | 44 | initial.default_attributes = initial.pica_registers + initial.pica_registers_size * sizeof(u32); |
| 46 | initial.vs_swizzle_data = initial.vs_program_binary + initial.vs_program_binary_size * sizeof(u32); | 45 | initial.vs_program_binary = |
| 47 | initial.vs_float_uniforms = initial.vs_swizzle_data + initial.vs_swizzle_data_size * sizeof(u32); | 46 | initial.default_attributes + initial.default_attributes_size * sizeof(u32); |
| 48 | initial.gs_program_binary = initial.vs_float_uniforms + initial.vs_float_uniforms_size * sizeof(u32); | 47 | initial.vs_swizzle_data = |
| 49 | initial.gs_swizzle_data = initial.gs_program_binary + initial.gs_program_binary_size * sizeof(u32); | 48 | initial.vs_program_binary + initial.vs_program_binary_size * sizeof(u32); |
| 50 | initial.gs_float_uniforms = initial.gs_swizzle_data + initial.gs_swizzle_data_size * sizeof(u32); | 49 | initial.vs_float_uniforms = |
| 51 | header.stream_offset = initial.gs_float_uniforms + initial.gs_float_uniforms_size * sizeof(u32); | 50 | initial.vs_swizzle_data + initial.vs_swizzle_data_size * sizeof(u32); |
| 51 | initial.gs_program_binary = | ||
| 52 | initial.vs_float_uniforms + initial.vs_float_uniforms_size * sizeof(u32); | ||
| 53 | initial.gs_swizzle_data = | ||
| 54 | initial.gs_program_binary + initial.gs_program_binary_size * sizeof(u32); | ||
| 55 | initial.gs_float_uniforms = | ||
| 56 | initial.gs_swizzle_data + initial.gs_swizzle_data_size * sizeof(u32); | ||
| 57 | header.stream_offset = initial.gs_float_uniforms + initial.gs_float_uniforms_size * sizeof(u32); | ||
| 52 | 58 | ||
| 53 | // Iterate through stream elements, update relevant stream element data | 59 | // Iterate through stream elements, update relevant stream element data |
| 54 | for (auto& stream_element : stream) { | 60 | for (auto& stream_element : stream) { |
| 55 | switch (stream_element.data.type) { | 61 | switch (stream_element.data.type) { |
| 56 | case MemoryLoad: | 62 | case MemoryLoad: { |
| 57 | { | ||
| 58 | auto& file_offset = memory_regions[stream_element.hash]; | 63 | auto& file_offset = memory_regions[stream_element.hash]; |
| 59 | if (!stream_element.uses_existing_data) { | 64 | if (!stream_element.uses_existing_data) { |
| 60 | file_offset = header.stream_offset; | 65 | file_offset = header.stream_offset; |
| @@ -79,44 +84,62 @@ void Recorder::Finish(const std::string& filename) { | |||
| 79 | throw "Failed to write header"; | 84 | throw "Failed to write header"; |
| 80 | 85 | ||
| 81 | // Write initial state | 86 | // Write initial state |
| 82 | written = file.WriteArray(initial_state.gpu_registers.data(), initial_state.gpu_registers.size()); | 87 | written = |
| 88 | file.WriteArray(initial_state.gpu_registers.data(), initial_state.gpu_registers.size()); | ||
| 83 | if (written != initial_state.gpu_registers.size() || file.Tell() != initial.lcd_registers) | 89 | if (written != initial_state.gpu_registers.size() || file.Tell() != initial.lcd_registers) |
| 84 | throw "Failed to write GPU registers"; | 90 | throw "Failed to write GPU registers"; |
| 85 | 91 | ||
| 86 | written = file.WriteArray(initial_state.lcd_registers.data(), initial_state.lcd_registers.size()); | 92 | written = |
| 93 | file.WriteArray(initial_state.lcd_registers.data(), initial_state.lcd_registers.size()); | ||
| 87 | if (written != initial_state.lcd_registers.size() || file.Tell() != initial.pica_registers) | 94 | if (written != initial_state.lcd_registers.size() || file.Tell() != initial.pica_registers) |
| 88 | throw "Failed to write LCD registers"; | 95 | throw "Failed to write LCD registers"; |
| 89 | 96 | ||
| 90 | written = file.WriteArray(initial_state.pica_registers.data(), initial_state.pica_registers.size()); | 97 | written = file.WriteArray(initial_state.pica_registers.data(), |
| 91 | if (written != initial_state.pica_registers.size() || file.Tell() != initial.default_attributes) | 98 | initial_state.pica_registers.size()); |
| 99 | if (written != initial_state.pica_registers.size() || | ||
| 100 | file.Tell() != initial.default_attributes) | ||
| 92 | throw "Failed to write Pica registers"; | 101 | throw "Failed to write Pica registers"; |
| 93 | 102 | ||
| 94 | written = file.WriteArray(initial_state.default_attributes.data(), initial_state.default_attributes.size()); | 103 | written = file.WriteArray(initial_state.default_attributes.data(), |
| 95 | if (written != initial_state.default_attributes.size() || file.Tell() != initial.vs_program_binary) | 104 | initial_state.default_attributes.size()); |
| 105 | if (written != initial_state.default_attributes.size() || | ||
| 106 | file.Tell() != initial.vs_program_binary) | ||
| 96 | throw "Failed to write default vertex attributes"; | 107 | throw "Failed to write default vertex attributes"; |
| 97 | 108 | ||
| 98 | written = file.WriteArray(initial_state.vs_program_binary.data(), initial_state.vs_program_binary.size()); | 109 | written = file.WriteArray(initial_state.vs_program_binary.data(), |
| 99 | if (written != initial_state.vs_program_binary.size() || file.Tell() != initial.vs_swizzle_data) | 110 | initial_state.vs_program_binary.size()); |
| 111 | if (written != initial_state.vs_program_binary.size() || | ||
| 112 | file.Tell() != initial.vs_swizzle_data) | ||
| 100 | throw "Failed to write vertex shader program binary"; | 113 | throw "Failed to write vertex shader program binary"; |
| 101 | 114 | ||
| 102 | written = file.WriteArray(initial_state.vs_swizzle_data.data(), initial_state.vs_swizzle_data.size()); | 115 | written = file.WriteArray(initial_state.vs_swizzle_data.data(), |
| 103 | if (written != initial_state.vs_swizzle_data.size() || file.Tell() != initial.vs_float_uniforms) | 116 | initial_state.vs_swizzle_data.size()); |
| 117 | if (written != initial_state.vs_swizzle_data.size() || | ||
| 118 | file.Tell() != initial.vs_float_uniforms) | ||
| 104 | throw "Failed to write vertex shader swizzle data"; | 119 | throw "Failed to write vertex shader swizzle data"; |
| 105 | 120 | ||
| 106 | written = file.WriteArray(initial_state.vs_float_uniforms.data(), initial_state.vs_float_uniforms.size()); | 121 | written = file.WriteArray(initial_state.vs_float_uniforms.data(), |
| 107 | if (written != initial_state.vs_float_uniforms.size() || file.Tell() != initial.gs_program_binary) | 122 | initial_state.vs_float_uniforms.size()); |
| 123 | if (written != initial_state.vs_float_uniforms.size() || | ||
| 124 | file.Tell() != initial.gs_program_binary) | ||
| 108 | throw "Failed to write vertex shader float uniforms"; | 125 | throw "Failed to write vertex shader float uniforms"; |
| 109 | 126 | ||
| 110 | written = file.WriteArray(initial_state.gs_program_binary.data(), initial_state.gs_program_binary.size()); | 127 | written = file.WriteArray(initial_state.gs_program_binary.data(), |
| 111 | if (written != initial_state.gs_program_binary.size() || file.Tell() != initial.gs_swizzle_data) | 128 | initial_state.gs_program_binary.size()); |
| 129 | if (written != initial_state.gs_program_binary.size() || | ||
| 130 | file.Tell() != initial.gs_swizzle_data) | ||
| 112 | throw "Failed to write geomtry shader program binary"; | 131 | throw "Failed to write geomtry shader program binary"; |
| 113 | 132 | ||
| 114 | written = file.WriteArray(initial_state.gs_swizzle_data.data(), initial_state.gs_swizzle_data.size()); | 133 | written = file.WriteArray(initial_state.gs_swizzle_data.data(), |
| 115 | if (written != initial_state.gs_swizzle_data.size() || file.Tell() != initial.gs_float_uniforms) | 134 | initial_state.gs_swizzle_data.size()); |
| 135 | if (written != initial_state.gs_swizzle_data.size() || | ||
| 136 | file.Tell() != initial.gs_float_uniforms) | ||
| 116 | throw "Failed to write geometry shader swizzle data"; | 137 | throw "Failed to write geometry shader swizzle data"; |
| 117 | 138 | ||
| 118 | written = file.WriteArray(initial_state.gs_float_uniforms.data(), initial_state.gs_float_uniforms.size()); | 139 | written = file.WriteArray(initial_state.gs_float_uniforms.data(), |
| 119 | if (written != initial_state.gs_float_uniforms.size() || file.Tell() != initial.gs_float_uniforms + sizeof(u32) * initial.gs_float_uniforms_size) | 140 | initial_state.gs_float_uniforms.size()); |
| 141 | if (written != initial_state.gs_float_uniforms.size() || | ||
| 142 | file.Tell() != initial.gs_float_uniforms + sizeof(u32) * initial.gs_float_uniforms_size) | ||
| 120 | throw "Failed to write geometry shader float uniforms"; | 143 | throw "Failed to write geometry shader float uniforms"; |
| 121 | 144 | ||
| 122 | // Iterate through stream elements, write "extra data" | 145 | // Iterate through stream elements, write "extra data" |
| @@ -124,7 +147,8 @@ void Recorder::Finish(const std::string& filename) { | |||
| 124 | if (stream_element.extra_data.size() == 0) | 147 | if (stream_element.extra_data.size() == 0) |
| 125 | continue; | 148 | continue; |
| 126 | 149 | ||
| 127 | written = file.WriteBytes(stream_element.extra_data.data(), stream_element.extra_data.size()); | 150 | written = |
| 151 | file.WriteBytes(stream_element.extra_data.data(), stream_element.extra_data.size()); | ||
| 128 | if (written != stream_element.extra_data.size()) | 152 | if (written != stream_element.extra_data.size()) |
| 129 | throw "Failed to write extra data"; | 153 | throw "Failed to write extra data"; |
| 130 | } | 154 | } |
| @@ -137,17 +161,17 @@ void Recorder::Finish(const std::string& filename) { | |||
| 137 | if (1 != file.WriteObject(stream_element.data)) | 161 | if (1 != file.WriteObject(stream_element.data)) |
| 138 | throw "Failed to write stream element"; | 162 | throw "Failed to write stream element"; |
| 139 | } | 163 | } |
| 140 | } catch(const char* str) { | 164 | } catch (const char* str) { |
| 141 | LOG_ERROR(HW_GPU, "Writing CiTrace file failed: %s", str); | 165 | LOG_ERROR(HW_GPU, "Writing CiTrace file failed: %s", str); |
| 142 | } | 166 | } |
| 143 | } | 167 | } |
| 144 | 168 | ||
| 145 | void Recorder::FrameFinished() { | 169 | void Recorder::FrameFinished() { |
| 146 | stream.push_back( { { FrameMarker } } ); | 170 | stream.push_back({{FrameMarker}}); |
| 147 | } | 171 | } |
| 148 | 172 | ||
| 149 | void Recorder::MemoryAccessed(const u8* data, u32 size, u32 physical_address) { | 173 | void Recorder::MemoryAccessed(const u8* data, u32 size, u32 physical_address) { |
| 150 | StreamElement element = { { MemoryLoad } }; | 174 | StreamElement element = {{MemoryLoad}}; |
| 151 | element.data.memory_load.size = size; | 175 | element.data.memory_load.size = size; |
| 152 | element.data.memory_load.physical_address = physical_address; | 176 | element.data.memory_load.physical_address = physical_address; |
| 153 | 177 | ||
| @@ -166,22 +190,22 @@ void Recorder::MemoryAccessed(const u8* data, u32 size, u32 physical_address) { | |||
| 166 | stream.push_back(element); | 190 | stream.push_back(element); |
| 167 | } | 191 | } |
| 168 | 192 | ||
| 169 | template<typename T> | 193 | template <typename T> |
| 170 | void Recorder::RegisterWritten(u32 physical_address, T value) { | 194 | void Recorder::RegisterWritten(u32 physical_address, T value) { |
| 171 | StreamElement element = { { RegisterWrite } }; | 195 | StreamElement element = {{RegisterWrite}}; |
| 172 | element.data.register_write.size = (sizeof(T) == 1) ? CTRegisterWrite::SIZE_8 | 196 | element.data.register_write.size = |
| 173 | : (sizeof(T) == 2) ? CTRegisterWrite::SIZE_16 | 197 | (sizeof(T) == 1) ? CTRegisterWrite::SIZE_8 |
| 174 | : (sizeof(T) == 4) ? CTRegisterWrite::SIZE_32 | 198 | : (sizeof(T) == 2) ? CTRegisterWrite::SIZE_16 |
| 175 | : CTRegisterWrite::SIZE_64; | 199 | : (sizeof(T) == 4) ? CTRegisterWrite::SIZE_32 |
| 200 | : CTRegisterWrite::SIZE_64; | ||
| 176 | element.data.register_write.physical_address = physical_address; | 201 | element.data.register_write.physical_address = physical_address; |
| 177 | element.data.register_write.value = value; | 202 | element.data.register_write.value = value; |
| 178 | 203 | ||
| 179 | stream.push_back(element); | 204 | stream.push_back(element); |
| 180 | } | 205 | } |
| 181 | 206 | ||
| 182 | template void Recorder::RegisterWritten(u32,u8); | 207 | template void Recorder::RegisterWritten(u32, u8); |
| 183 | template void Recorder::RegisterWritten(u32,u16); | 208 | template void Recorder::RegisterWritten(u32, u16); |
| 184 | template void Recorder::RegisterWritten(u32,u32); | 209 | template void Recorder::RegisterWritten(u32, u32); |
| 185 | template void Recorder::RegisterWritten(u32,u64); | 210 | template void Recorder::RegisterWritten(u32, u64); |
| 186 | |||
| 187 | } | 211 | } |