Skip to content

target tracy@0.14.1 and zig@0.16.0 #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tyoc213 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

target tracy@0.14.1 and zig@0.16.0 #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions build.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,10 @@ pub fn build(b: *std.Build) void {
.target = target,
.optimize = optimize,
}),
// https://codeberg.org/ziglang/zig/issues/31272#issuecomment-14606517
// R_X86_64_PC64 .sframe relocation in 0.16.0
.use_llvm = true,
.use_lld = true,
});
tests.root_module.linkLibrary(tracy);
b.installArtifact(tests);
Expand Down
2 changes: 1 addition & 1 deletion build.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
.name = .ztracy,
.fingerprint = 0xf803f1f7ab5272cc,
.version = "0.14.0-dev",
.minimum_zig_version = "0.15.1",
.minimum_zig_version = "0.16.0",
.paths = .{
"build.zig",
"build.zig.zon",
Expand Down
1,272 changes: 1,272 additions & 0 deletions libs/tracy/TracyClient.F90
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions libs/tracy/TracyClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@
#include "client/TracySysTime.cpp"
#include "client/TracySysTrace.cpp"
#include "common/TracySocket.cpp"
#ifndef TRACY_HAS_CUSTOM_ALLOCATOR
#include "client/tracy_rpmalloc.cpp"
#endif
#include "client/TracyDxt1.cpp"
#include "client/TracyAlloc.cpp"
#include "client/TracyOverride.cpp"
Expand Down
16 changes: 12 additions & 4 deletions libs/tracy/client/TracyAlloc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "../common/TracyAlloc.hpp"

#ifdef TRACY_USE_RPMALLOC
#if defined TRACY_USE_RPMALLOC || defined TRACY_HAS_CUSTOM_ALLOCATOR

#include <atomic>

Expand All @@ -14,7 +14,7 @@ extern thread_local bool RpThreadInitDone;
extern std::atomic<int> RpInitDone;
extern std::atomic<int> RpInitLock;

tracy_no_inline static void InitRpmallocPlumbing()
tracy_no_inline static void InitAllocatorPlumbing()
{
const auto done = RpInitDone.load( std::memory_order_acquire );
if( !done )
Expand All @@ -24,18 +24,26 @@ tracy_no_inline static void InitRpmallocPlumbing()
const auto done = RpInitDone.load( std::memory_order_acquire );
if( !done )
{
#if defined TRACY_HAS_CUSTOM_ALLOCATOR
PlatformAllocatorInit();
#else
rpmalloc_initialize();
#endif
RpInitDone.store( 1, std::memory_order_release );
}
RpInitLock.store( 0, std::memory_order_release );
}
#if defined TRACY_HAS_CUSTOM_ALLOCATOR
PlatformAllocatorThreadInit();
#else
rpmalloc_thread_initialize();
#endif
RpThreadInitDone = true;
}

TRACY_API void InitRpmalloc()
TRACY_API void InitAllocator()
{
if( !RpThreadInitDone ) InitRpmallocPlumbing();
if( !RpThreadInitDone ) InitAllocatorPlumbing();
}

}
Expand Down
167 changes: 158 additions & 9 deletions libs/tracy/client/TracyArmCpuTable.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ static const char* DecodeArmImplementer( uint32_t v )
case 0x66: return "Faraday";
case 0x68: return "HXT";
case 0x69: return "Intel";
case 0x6d: return "Microsoft";
case 0x70: return "Phytium";
case 0xc0: return "Ampere Computing";
default: break;
}
Expand Down Expand Up @@ -90,20 +92,44 @@ static const char* DecodeArmPart( uint32_t impl, uint32_t part )
case 0xd0e: return " Cortex-A76AE";
case 0xd0f: return " AEMv8";
case 0xd13: return " Cortex-R52";
case 0xd14: return " Cortex-R82AE";
case 0xd15: return " Cortex-R82";
case 0xd16: return " Cortex-R52+";
case 0xd20: return " Cortex-M23";
case 0xd21: return " Cortex-M33";
case 0xd22: return " Cortex-M55";
case 0xd23: return " Cortex-M85";
case 0xd24: return " Cortex-M52";
case 0xd40: return " Neoverse V1";
case 0xd41: return " Cortex-A78";
case 0xd42: return " Cortex-A78AE";
case 0xd43: return " Cortex-A65AE";
case 0xd44: return " Cortex-X1";
case 0xd46: return " Cortex-A510";
case 0xd47: return " Cortex-A710";
case 0xd48: return " Cortex-X2";
case 0xd49: return " Neoverse N2";
case 0xd4a: return " Neoverse E1";
case 0xd4b: return " Cortex-A78C";
case 0xd4c: return " Cortex-X1C";
case 0xd4d: return " Cortex-A715";
case 0xd4e: return " Cortex-X3";
case 0xd4f: return " Neoverse-V2";
case 0xd80: return " Cortex-A520";
case 0xd81: return " Cortex-A720";
case 0xd82: return " Cortex-X4";
case 0xd83: return " Neoverse-V3AE";
case 0xd84: return " Neoverse-V3";
case 0xd85: return " Cortex-X925";
case 0xd87: return " Cortex-A725";
case 0xd88: return " Cortex-A520AE";
case 0xd89: return " Cortex-A720AE";
case 0xd8a: return " C1-Nano";
case 0xd8b: return " C1-Pro";
case 0xd8c: return " C1-Ultra";
case 0xd8e: return " Neoverse-N3";
case 0xd8f: return " Cortex-A320";
case 0xd90: return " C1-Premium";
default: break;
}
case 0x42: // Broadcom
Expand Down Expand Up @@ -143,13 +169,17 @@ static const char* DecodeArmPart( uint32_t impl, uint32_t part )
switch( part )
{
case 0x1: return " A64FX";
case 0x3: return " MONAKA";
default: break;
}
case 0x48: // HiSilicon
switch( part )
{
case 0xd01: return " TSV100";
case 0xd40: return " Kirin 980";
case 0xd01: return " TaiShan-v110";
case 0xd02: return " TaiShan-v120";
case 0xd06: return " hip12";
case 0xd40: return " Cortex-A76";
case 0xd41: return " Cortex-A77";
default: break;
}
case 0x4e: // Nvidia
Expand All @@ -158,6 +188,8 @@ static const char* DecodeArmPart( uint32_t impl, uint32_t part )
case 0x0: return " Denver";
case 0x3: return " Denver 2";
case 0x4: return " Carmel";
case 0x10: return " Olympus";
case 0x11: return " Rigel";
default: break;
}
case 0x50: // Applied Micro
Expand All @@ -169,6 +201,7 @@ static const char* DecodeArmPart( uint32_t impl, uint32_t part )
case 0x51: // Qualcomm
switch( part )
{
case 0x1: return " Oryon";
case 0xf: return " Scorpion";
case 0x2d: return " Scorpion";
case 0x4d: return " Krait";
Expand Down Expand Up @@ -213,19 +246,60 @@ static const char* DecodeArmPart( uint32_t impl, uint32_t part )
case 0x61: // Apple
switch( part )
{
case 0x0: return " Swift";
case 0x1: return " Cyclone";
case 0x2: return " Typhoon";
case 0x3: return " Typhoon/Capri";
case 0x4: return " Twister";
case 0x5: return " Twister/Elba/Malta";
case 0x6: return " Hurricane";
case 0x7: return " Hurricane/Myst";
case 0x8: return " Monsoon";
case 0x9: return " Mistral";
case 0xb: return " Vortex";
case 0xc: return " Tempest";
case 0xf: return " Tempest-M9";
case 0x10: return " Vortex/Aruba";
case 0x11: return " Tempest/Aruba";
case 0x12: return " Lightning";
case 0x13: return " Thunder";
case 0x20: return " A14 Icestorm";
case 0x21: return " A14 Firestorm";
case 0x22: return " M1 Icestorm";
case 0x23: return " M1 Firestorm";
case 0x24: return " M1 Icestorm Pro";
case 0x25: return " M1 Firestorm Pro";
case 0x26: return " M10 Thunder";
case 0x28: return " M1 Icestorm Max";
case 0x29: return " M1 Firestorm Max";
case 0x30: return " A15 Blizzard";
case 0x31: return " A15 Avalanche";
case 0x32: return " M2 Blizzard";
case 0x33: return " M2 Avalanche";
case 0x34: return " M2 Pro Blizzard";
case 0x35: return " M2 Pro Avalanche";
case 0x36: return " A16 Sawtooth";
case 0x37: return " A16 Everest";
case 0x38: return " M2 Max Blizzard";
case 0x39: return " M2 Max Avalanche";
case 0x42: return " M3";
case 0x43: return " M3";
case 0x44: return " M3";
case 0x45: return " M3";
case 0x48: return " M3";
case 0x49: return " M3";
case 0x52: return " M4";
case 0x53: return " M4";
case 0x54: return " M4";
case 0x55: return " M4";
case 0x58: return " M4";
case 0x59: return " M4";
case 0x62: return " M5";
case 0x63: return " M5";
case 0x64: return " M5";
case 0x65: return " M5";
case 0x68: return " M5";
case 0x69: return " M5";
default: break;
}
case 0x66: // Faraday
Expand All @@ -241,10 +315,55 @@ static const char* DecodeArmPart( uint32_t impl, uint32_t part )
case 0x0: return " Phecda";
default: break;
}
case 0x69: // Intel
switch( part )
{
case 0x200: return " i80200";
case 0x210: return " PXA250A";
case 0x212: return " PXA210A";
case 0x242: return " i80321-400";
case 0x243: return " i80321-600";
case 0x290: return " PXA250B/PXA26x";
case 0x292: return " PXA210B";
case 0x2c2: return " i80321-400-B0";
case 0x2c3: return " i80321-600-B0";
case 0x2d0: return " PXA250C/PXA255/PXA26x";
case 0x2d2: return " PXA210C";
case 0x411: return " PXA27x";
case 0x41c: return " IPX425-533";
case 0x41d: return " IPX425-400";
case 0x41f: return " IPX425-266";
case 0x682: return " PXA32x";
case 0x683: return " PXA930/PXA935";
case 0x688: return " PXA30x";
case 0x689: return " PXA31x";
case 0xb11: return " SA1110";
case 0xc12: return " IPX1200";
default: break;
}
case 0x6d: // Microsoft
switch( part )
{
case 0xd49: return " Azure-Cobalt-100";
default: break;
}
case 0x70: // Phytium
switch( part )
{
case 0x303: return " FTC310";
case 0x660: return " FTC660";
case 0x661: return " FTC661";
case 0x662: return " FTC662";
case 0x663: return " FTC663";
case 0x664: return " FTC664";
case 0x862: return " FTC862";
default: break;
}
case 0xc0: // Ampere Computing
switch( part )
{
case 0xac3: return " Ampere1";
case 0xac3: return " Ampere-1";
case 0xac4: return " Ampere-1a";
default: break;
}
default: break;
Expand Down Expand Up @@ -313,6 +432,16 @@ static const char* DecodeIosDevice( const char* id )
"iPhone15,5", "iPhone 15 Plus",
"iPhone16,1", "iPhone 15 Pro",
"iPhone16,2", "iPhone 15 Pro Max",
"iPhone17,1", "iPhone 16 Pro",
"iPhone17,2", "iPhone 16 Pro Max",
"iPhone17,3", "iPhone 16",
"iPhone17,4", "iPhone 16 Plus",
"iPhone17,5", "iPhone 16e",
"iPhone18,1", "iPhone 17 Pro",
"iPhone18,2", "iPhone 17 Pro Max",
"iPhone18,3", "iPhone 17",
"iPhone18,4", "iPhone Air",
"iPhone18,5", "iPhone 17e",
"iPad1,1", "iPad (A1219/A1337)",
"iPad2,1", "iPad 2 (A1395)",
"iPad2,2", "iPad 2 (A1396)",
Expand Down Expand Up @@ -387,14 +516,34 @@ static const char* DecodeIosDevice( const char* id )
"iPad13,11", "iPad Pro 12.9\" 5th gen",
"iPad13,16", "iPad Air 5th Gen (WiFi)",
"iPad13,17", "iPad Air 5th Gen (WiFi+Cellular)",
"iPad13,18", "iPad 10th Gen",
"iPad13,19", "iPad 10th Gen",
"iPad13,18", "iPad 10th Gen (WiFi)",
"iPad13,19", "iPad 10th Gen (WiFi+Cellular)",
"iPad14,1", "iPad mini 6th Gen (WiFi)",
"iPad14,2", "iPad mini 6th Gen (WiFi+Cellular)",
"iPad14,3", "iPad Pro 11\" 4th Gen",
"iPad14,4", "iPad Pro 11\" 4th Gen",
"iPad14,5", "iPad Pro 12.9\" 6th Gen",
"iPad14,6", "iPad Pro 12.9\" 6th Gen",
"iPad14,3", "iPad Pro 11\" 4th Gen (WiFi)",
"iPad14,4", "iPad Pro 11\" 4th Gen (WiFi+Cellular)",
"iPad14,5", "iPad Pro 12.9\" 6th Gen (WiFi)",
"iPad14,6", "iPad Pro 12.9\" 6th Gen (WiFi+Cellular)",
"iPad14,8", "iPad Air 11\" 6th Gen (WiFi)",
"iPad14,9", "iPad Air 11\" 6th Gen (WiFi+Cellular)",
"iPad14,10", "iPad Air 13\" 6th Gen (WiFi)",
"iPad14,11", "iPad Air 13\" 6th Gen (WiFi+Cellular)",
"iPad15,3", "iPad Air 11\" 7th Gen (WiFi)",
"iPad15,4", "iPad Air 11\" 7th Gen (WiFi+Cellular)",
"iPad15,5", "iPad Air 13\" 7th Gen (WiFi)",
"iPad15,6", "iPad Air 13\" 7th Gen (WiFi+Cellular)",
"iPad15,7", "iPad 11th Gen (WiFi)",
"iPad15,8", "iPad 11th Gen (WiFi+Cellular)",
"iPad16,1", "iPad mini 7th Gen (WiFi)",
"iPad16,2", "iPad mini 7th Gen (WiFi+Cellular)",
"iPad16,3", "iPad Pro 11\" 5th Gen (WiFi)",
"iPad16,4", "iPad Pro 11\" 5th Gen (WiFi+Cellular)",
"iPad16,5", "iPad Pro 12.9\" 7th Gen (WiFi)",
"iPad16,6", "iPad Pro 12.9\" 7th Gen (WiFi+Cellular)",
"iPad16,8", "iPad Air 11\" 8th Gen (WiFi)",
"iPad16,9", "iPad Air 11\" 8th Gen (WiFi+Cellular)",
"iPad16,10", "iPad Air 13\" 8th Gen (WiFi)",
"iPad16,11", "iPad Air 13\" 8th Gen (WiFi+Cellular)",
"iPod1,1", "iPod Touch",
"iPod2,1", "iPod Touch 2nd gen",
"iPod3,1", "iPod Touch 3rd gen",
Expand Down
Loading