Skip to content

GPU: let the constant-address-space constants be built on Metal #15963

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

Merged
ktf merged 1 commit into from
Oct 15, 2026
Merged

GPU: let the constant-address-space constants be built on Metal #15963

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: 2 additions & 2 deletions DataFormats/Reconstruction/include/ReconstructionDataFormats/GlobalTrackID.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ GPUconstexpr() GlobalTrackID::mask_t sMasks[GlobalTrackID::NSources] = ///< dete
GlobalTrackID::mask_t(math_utils::bit2Mask(GlobalTrackID::MCHMID)) // Temporary ordering
};

#ifndef __OPENCL__
#if !defined(__OPENCL__) && !defined(__METAL__)
GPUconstexpr() GlobalTrackID::mask_t sTrackSources =
sMasks[GlobalTrackID::ITS] | sMasks[GlobalTrackID::TPC] | sMasks[GlobalTrackID::MFT] | sMasks[GlobalTrackID::MCH] | sMasks[GlobalTrackID::ITSTPC] | sMasks[GlobalTrackID::TPCTOF] |
sMasks[GlobalTrackID::TPCTRD] | sMasks[GlobalTrackID::MFTMCH] | sMasks[GlobalTrackID::ITSTPCTRD] | sMasks[GlobalTrackID::ITSTPCTOF] | sMasks[GlobalTrackID::TPCTRDTOF] |
Expand All @@ -177,7 +177,7 @@ GPUconstexpr() GlobalTrackID::mask_t sTrackSources =
GPUdi() constexpr GlobalTrackID::DetID::mask_t GlobalTrackID::getSourceDetectorsMask(int i) { return globaltrackid_internal::SourceDetectorsMasks[i]; }
GPUdi() constexpr GlobalTrackID::mask_t GlobalTrackID::getSourceMask(int s) { return globaltrackid_internal::sMasks[s]; }

#ifndef __OPENCL__
#if !defined(__OPENCL__) && !defined(__METAL__)
GPUdi() bool GlobalTrackID::isTrackSource(int s)
{
return globaltrackid_internal::sTrackSources[s];
Expand Down
3 changes: 3 additions & 0 deletions GPU/GPUTracking/TPCClusterFinder/CfChargePos.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ struct CfChargePos {
: gpad(tpcGlobalPadIdx(row, pad)), timePadded(t + GPUCF_PADDING_TIME)
{
}
#ifdef __METAL__
constexpr GPUhdi() CfChargePos(tpccf::Row row, tpccf::Pad pad, tpccf::TPCFragmentTime t) constant : gpad(tpcGlobalPadIdx(row, pad)), timePadded(t + GPUCF_PADDING_TIME) {}
#endif

GPUdi() CfChargePos(const tpccf::GlobalPad& p, const tpccf::TPCFragmentTime& t) : gpad(p), timePadded(t) {}

Expand Down
3 changes: 3 additions & 0 deletions GPU/Utils/GPUCommonBitSet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ class bitset
GPUdDefault() constexpr bitset(const __constant bitset&) = default;
#endif // __OPENCL__
GPUd() constexpr bitset(uint32_t vv) : v(vv) {};
#ifdef __METAL__
GPUd() constexpr bitset(uint32_t vv) constant : v(vv) {};
#endif
static GPUglobalconstexpr() uint32_t full_set = ((1ul << N) - 1ul);

GPUd() constexpr bool all() const { return (v & full_set) == full_set; }
Expand Down
Loading