Skip to content

GPU: Some fixes #14766

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
davidrohr merged 3 commits into from
Oct 24, 2025
Merged

GPU: Some fixes #14766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
45e63be
GPU: Fix architecture name, we do not use MI2xx
davidrohr Oct 23, 2025
5b0ac1d
GPU: Improve track sorting before merging, group discarded tracks
davidrohr Sep 28, 2025
bff8819
GPU TPC: Fix rejection of inside IFC clusters
davidrohr Sep 23, 2025
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
2 changes: 1 addition & 1 deletion GPU/GPUTracking/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ target_sources(${targetName}
BASE_DIRS ${CMAKE_CURRENT_BINARY_DIR})

make_directory(${CMAKE_CURRENT_BINARY_DIR}/genGPUArch)
set(GPU_CONST_PARAM_ARCHITECTUES AMPERE TURING VEGA MI2xx)
set(GPU_CONST_PARAM_ARCHITECTUES AMPERE TURING VEGA MI100)
set(GPU_CONST_PARAM_FILES "")
foreach(GPU_ARCH ${GPU_CONST_PARAM_ARCHITECTUES})
set(PARAMFILE ${CMAKE_CURRENT_BINARY_DIR}/genGPUArch/gpu_const_param_${GPU_ARCH}.par)
Expand Down
2 changes: 1 addition & 1 deletion GPU/GPUTracking/Definitions/GPUDefParametersDefaults.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
// GPU Run Configuration
#if defined(GPUCA_GPUCODE) && !defined(GPUCA_GPUCODE_GENRTC) && !defined(GPUCA_GPUCODE_NO_LAUNCH_BOUNDS) // Avoid including for RTC generation besides normal include protection.
// GPU-architecture-dependent default settings
#if defined(GPUCA_GPUTYPE_MI2xx)
#if defined(GPUCA_GPUTYPE_MI100)
#define GPUCA_WARP_SIZE 64
#define GPUCA_THREAD_COUNT_DEFAULT 256
#define GPUCA_LB_GPUTPCCreateTrackingData 256
Expand Down
3 changes: 3 additions & 0 deletions GPU/GPUTracking/Merger/GPUTPCGMMerger.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,9 @@ struct GPUTPCGMMergerSortTracks_comp {
{
const GPUTPCGMMergedTrack& GPUrestrict() a = mCmp[aa];
const GPUTPCGMMergedTrack& GPUrestrict() b = mCmp[bb];
if (a.OK() != b.OK()) {
return a.OK();
}
if (a.CCE() != b.CCE()) {
return a.CCE() > b.CCE();
}
Expand Down
1 change: 1 addition & 0 deletions GPU/GPUTracking/Merger/GPUTPCGMTrackParam.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ GPUd() bool GPUTPCGMTrackParam::Fit(GPUTPCGMMerger* GPUrestrict() merger, int32_
const float rmax = (83.5f + param.rec.tpc.sysClusErrorMinDist);
if (r2 < rmax * rmax) {
MarkClusters(clusters, ihitMergeFirst, ihit, wayDirection, GPUTPCGMMergedTrackHit::flagRejectErr);
continue;
}
}

Expand Down
6 changes: 3 additions & 3 deletions dependencies/FindO2GPU.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# or submit itself to any jurisdiction.

# NOTE!!!! - Whenever this file is changed, move it over to alidist/resources
# FindO2GPU.cmake Version 3
# FindO2GPU.cmake Version 4

if(NOT DEFINED ENABLE_CUDA)
set(ENABLE_CUDA "AUTO")
Expand Down Expand Up @@ -58,10 +58,10 @@ function(set_target_hip_arch target)
target_compile_definitions(${target} PUBLIC GPUCA_GPUTYPE_VEGA)
elseif(HIP_AMDGPUTARGET AND HIP_AMDGPUTARGET MATCHES "gfx908")
message(STATUS "Using optimized HIP settings for MI100 GPU")
target_compile_definitions(${target} PUBLIC GPUCA_GPUTYPE_MI2xx)
target_compile_definitions(${target} PUBLIC GPUCA_GPUTYPE_MI100)
elseif(HIP_AMDGPUTARGET AND HIP_AMDGPUTARGET MATCHES "gfx90a")
message(STATUS "Using optimized HIP settings for MI210 GPU")
target_compile_definitions(${target} PUBLIC GPUCA_GPUTYPE_MI2xx)
target_compile_definitions(${target} PUBLIC GPUCA_GPUTYPE_MI100)
else()
target_compile_definitions(${target} PUBLIC GPUCA_GPUTYPE_VEGA)
endif()
Expand Down