Fixed a timestamp bug in Vulkan and renamed the conversion constants to fit their purpose

Author: Sigalalg

CodeXL/Components/GpuProfiling/AMDTGpuProfiling/ProfileSessionDataItem.cpp

@@ -912,7 +912,8 @@ quint64 ProfileSessionDataItem::TimeMilliseconds(quint64 time) const
 {
     quint64 retVal = time;
 
-    if (m_itemType.m_itemMainType == DX12_API_PROFILE_ITEM || m_itemType.m_itemMainType == DX12_GPU_PROFILE_ITEM)
+    if ((m_itemType.m_itemMainType == DX12_API_PROFILE_ITEM || m_itemType.m_itemMainType == DX12_GPU_PROFILE_ITEM) ||
+        (m_itemType.m_itemMainType == VK_API_PROFILE_ITEM || m_itemType.m_itemMainType == VK_GPU_PROFILE_ITEM))
     {
         retVal = time / GP_NANOSECONDS_TO_MILLISECOND;
     }

CodeXL/Components/GpuProfiling/Backend/DX12Trace/DX12AtpFile.cpp

@@ -41,9 +41,9 @@ const static std::string s_str_apiTypeHeaderPrefix = "//API=";
 const static std::string s_str_threadIDHeaderPrefix = "//ThreadID=";
 const static std::string s_str_threadAPICountHeaderPrefix = "//ThreadAPICount=";
 
-// The DX12 timestamps are double number. The data structures expect long long numbers, so we multiply the double timestamp by a GP_DX_TIMESTAMP_FACTOR
+// The DX12 timestamps are double number. The data structures expect long long numbers, so we multiply the double timestamp by a GP_DX_TIMESTAMP_MILLISECONDS_TO_NANOSECONDS_FACTOR
 // to make sure that we get integer value. In the front-end, we will perform the opposite operation
-#define GP_DX_TIMESTAMP_FACTOR 1000000
+#define GP_DX_TIMESTAMP_MILLISECONDS_TO_NANOSECONDS_FACTOR 1000000
 
 #define KILO_BYTE 1024
 #define MEGA_BYTE (KILO_BYTE * 1024)
@@ -201,8 +201,8 @@ bool DX12AtpFilePart::ParseGPUAPICallString(const std::string& apiStr, DX12GPUTr
 
                                 // The timestamps are stored in a double number, in milliseconds units.
                                 // We multiply it by 1000000, to keep the accuracy, and we will refer to it as nanoseconds
-                                apiInfo.m_ullStart = ULONGLONG(timeStartDouble * GP_DX_TIMESTAMP_FACTOR);
-                                apiInfo.m_ullEnd = ULONGLONG(timeEndDouble * GP_DX_TIMESTAMP_FACTOR);
+                                apiInfo.m_ullStart = ULONGLONG(timeStartDouble * GP_DX_TIMESTAMP_MILLISECONDS_TO_NANOSECONDS_FACTOR);
+                                apiInfo.m_ullEnd = ULONGLONG(timeEndDouble * GP_DX_TIMESTAMP_MILLISECONDS_TO_NANOSECONDS_FACTOR);
 
                                 pCurrentToken = strtok(nullptr, " ");
 
@@ -385,8 +385,8 @@ bool DX12AtpFilePart::ParseCPUAPICallString(const std::string& apiStr, DX12APIIn
 
                 // The timestamps are stored in a double number, in milliseconds units.
                 // We multiply it by 1000000, to keep the accuracy, and we will refer to it as nanoseconds
-                apiInfo.m_ullStart = ULONGLONG(timeStartDouble * GP_DX_TIMESTAMP_FACTOR);
-                apiInfo.m_ullEnd = ULONGLONG(timeEndDouble * GP_DX_TIMESTAMP_FACTOR);
+                apiInfo.m_ullStart = ULONGLONG(timeStartDouble * GP_DX_TIMESTAMP_MILLISECONDS_TO_NANOSECONDS_FACTOR);
+                apiInfo.m_ullEnd = ULONGLONG(timeEndDouble * GP_DX_TIMESTAMP_MILLISECONDS_TO_NANOSECONDS_FACTOR);
 
                 pCurrentToken = strtok(nullptr, " ");
 

CodeXL/Components/GpuProfiling/Backend/VulkanTrace/VulkanAtpFile.cpp

@@ -41,7 +41,7 @@ const static std::string s_str_threadAPICountHeaderPrefix = "//ThreadAPICount=";
 
 // The Vulkan timestamps are double number. The data structures expect long long numbers, so we multiply the double timestamp by a GP_VK_TIMESTAMP_FACTOR
 // to make sure that we get integer value. In the front-end, we will perform the opposite operation
-#define GP_VK_TIMESTAMP_FACTOR 100000
+#define GP_VK_TIMESTAMP_MILLISECONDS_TO_NANOSECONDS_FACTOR 1000000
 
 VKAtpFilePart::VKAtpFilePart(const Config& config, bool shouldReleaseMemory) : IAtpFilePart(config, shouldReleaseMemory),
     m_currentParsedTraceType(API), m_currentParsedThreadID(0), m_currentParsedThreadAPICount(0),
@@ -151,8 +151,8 @@ bool VKAtpFilePart::ParseGPUAPICallString(const std::string& apiStr, VKGPUTraceI
         ss >> timeEndDouble;
         CHECK_SS_ERROR(ss);
 
-        apiInfo.m_ullStart = ULONGLONG(timeStartDouble * GP_VK_TIMESTAMP_FACTOR);
-        apiInfo.m_ullEnd = ULONGLONG(timeEndDouble * GP_VK_TIMESTAMP_FACTOR);
+        apiInfo.m_ullStart = ULONGLONG(timeStartDouble * GP_VK_TIMESTAMP_MILLISECONDS_TO_NANOSECONDS_FACTOR);
+        apiInfo.m_ullEnd = ULONGLONG(timeEndDouble * GP_VK_TIMESTAMP_MILLISECONDS_TO_NANOSECONDS_FACTOR);
 
         /// Store the GPU start time if it is not stored yet
         /// GPU timestamps to fit the CPU timeline
@@ -291,8 +291,8 @@ bool VKAtpFilePart::ParseCPUAPICallString(const std::string& apiStr, VKAPIInfo&
         ss >> timeEndDouble;
         CHECK_SS_ERROR(ss);
 
-        apiInfo.m_ullStart = ULONGLONG(timeStartDouble * GP_VK_TIMESTAMP_FACTOR);
-        apiInfo.m_ullEnd = ULONGLONG(timeEndDouble * GP_VK_TIMESTAMP_FACTOR);
+        apiInfo.m_ullStart = ULONGLONG(timeStartDouble * GP_VK_TIMESTAMP_MILLISECONDS_TO_NANOSECONDS_FACTOR);
+        apiInfo.m_ullEnd = ULONGLONG(timeEndDouble * GP_VK_TIMESTAMP_MILLISECONDS_TO_NANOSECONDS_FACTOR);
 
         // Store the CPU start and end time (if not stored yet)
         if (m_cpuStart == 0)