Skip to content

Commit 64ef6b9

Browse files
davidrohrdavidrohr
committed
Revert "GPU: Temporarily move some defines back to the wrapper, to be cleaned up in another PR"
This reverts commit da00550.
1 parent 466ba06 commit 64ef6b9

File tree

2 files changed

+41
-49
lines changed

2 files changed

+41
-49
lines changed

‎GPU/GPUTracking/Definitions/GPUDefParametersDefaults.h‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,16 @@
7575
#define GPUCA_LB_GPUTPCCFDeconvolution 512
7676
#define GPUCA_LB_GPUTPCCFClusterizer 448
7777
#define GPUCA_LB_COMPRESSION_GATHER 1024
78+
#define GPUCA_NEIGHBOURS_FINDER_MAX_NNEIGHUP 5
79+
#define GPUCA_TRACKLET_SELECTOR_HITS_REG_SIZE 20
80+
#define GPUCA_ALTERNATE_BORDER_SORT 1
81+
#define GPUCA_SORT_BEFORE_FIT 1
82+
#define GPUCA_MERGER_SPLIT_LOOP_INTERPOLATION 1
83+
#define GPUCA_NO_ATOMIC_PRECHECK 1
84+
#define GPUCA_DEDX_STORAGE_TYPE uint16_t
85+
#define GPUCA_MERGER_INTERPOLATION_ERROR_TYPE half
86+
#define GPUCA_COMP_GATHER_KERNEL 4
87+
#define GPUCA_COMP_GATHER_MODE 3
7888
#elif defined(GPUCA_GPUTYPE_VEGA)
7989
#define GPUCA_WARP_SIZE 64
8090
#define GPUCA_THREAD_COUNT_DEFAULT 256
@@ -128,6 +138,16 @@
128138
#define GPUCA_LB_GPUTPCCFDeconvolution 512
129139
#define GPUCA_LB_GPUTPCCFClusterizer 512
130140
#define GPUCA_LB_COMPRESSION_GATHER 1024
141+
#define GPUCA_NEIGHBOURS_FINDER_MAX_NNEIGHUP 5
142+
#define GPUCA_TRACKLET_SELECTOR_HITS_REG_SIZE 20
143+
#define GPUCA_ALTERNATE_BORDER_SORT 1
144+
#define GPUCA_SORT_BEFORE_FIT 1
145+
#define GPUCA_MERGER_SPLIT_LOOP_INTERPOLATION 1
146+
#define GPUCA_NO_ATOMIC_PRECHECK 1
147+
#define GPUCA_DEDX_STORAGE_TYPE uint16_t
148+
#define GPUCA_MERGER_INTERPOLATION_ERROR_TYPE half
149+
#define GPUCA_COMP_GATHER_KERNEL 4
150+
#define GPUCA_COMP_GATHER_MODE 3
131151
#elif defined(GPUCA_GPUTYPE_AMPERE)
132152
#define GPUCA_WARP_SIZE 32
133153
#define GPUCA_THREAD_COUNT_DEFAULT 512
@@ -181,6 +201,16 @@
181201
#define GPUCA_LB_GPUTPCCFDeconvolution 384
182202
#define GPUCA_LB_GPUTPCCFClusterizer 448
183203
#define GPUCA_LB_COMPRESSION_GATHER 1024
204+
#define GPUCA_NEIGHBOURS_FINDER_MAX_NNEIGHUP 4
205+
#define GPUCA_TRACKLET_SELECTOR_HITS_REG_SIZE 20
206+
#define GPUCA_ALTERNATE_BORDER_SORT 1
207+
#define GPUCA_SORT_BEFORE_FIT 1
208+
#define GPUCA_MERGER_SPLIT_LOOP_INTERPOLATION 1
209+
#define GPUCA_NO_ATOMIC_PRECHECK 1
210+
#define GPUCA_DEDX_STORAGE_TYPE uint16_t
211+
#define GPUCA_MERGER_INTERPOLATION_ERROR_TYPE half
212+
#define GPUCA_COMP_GATHER_KERNEL 4
213+
#define GPUCA_COMP_GATHER_MODE 3
184214
#elif defined(GPUCA_GPUTYPE_TURING)
185215
#define GPUCA_WARP_SIZE 32
186216
#define GPUCA_THREAD_COUNT_DEFAULT 512
@@ -226,6 +256,16 @@
226256
#define GPUCA_LB_GPUTPCDecompressionKernels_step0attached 32, 1
227257
#define GPUCA_LB_GPUTPCDecompressionKernels_step1unattached 32, 1
228258
#define GPUCA_LB_COMPRESSION_GATHER 1024
259+
#define GPUCA_NEIGHBOURS_FINDER_MAX_NNEIGHUP 4
260+
#define GPUCA_TRACKLET_SELECTOR_HITS_REG_SIZE 20
261+
#define GPUCA_ALTERNATE_BORDER_SORT 1
262+
#define GPUCA_SORT_BEFORE_FIT 1
263+
#define GPUCA_MERGER_SPLIT_LOOP_INTERPOLATION 1
264+
#define GPUCA_NO_ATOMIC_PRECHECK 1
265+
#define GPUCA_COMP_GATHER_KERNEL 4
266+
#define GPUCA_COMP_GATHER_MODE 3
267+
#define GPUCA_DEDX_STORAGE_TYPE uint16_t
268+
#define GPUCA_MERGER_INTERPOLATION_ERROR_TYPE half
229269
// #define GPUCA_USE_TEXTURES
230270
#elif defined(GPUCA_GPUTYPE_OPENCL)
231271
#else

‎GPU/GPUTracking/Definitions/GPUDefParametersWrapper.h‎

Lines changed: 1 addition & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -22,55 +22,7 @@
2222
#include "GPUCommonDef.h"
2323
#include "GPUDefMacros.h"
2424

25-
#ifdef GPUCA_GPUCODE
26-
#if defined(GPUCA_GPUTYPE_MI2xx)
27-
#define GPUCA_NEIGHBOURS_FINDER_MAX_NNEIGHUP 5
28-
#define GPUCA_TRACKLET_SELECTOR_HITS_REG_SIZE 20
29-
#define GPUCA_ALTERNATE_BORDER_SORT 1
30-
#define GPUCA_SORT_BEFORE_FIT 1
31-
#define GPUCA_MERGER_SPLIT_LOOP_INTERPOLATION 1
32-
#define GPUCA_NO_ATOMIC_PRECHECK 1
33-
#define GPUCA_DEDX_STORAGE_TYPE uint16_t
34-
#define GPUCA_MERGER_INTERPOLATION_ERROR_TYPE half
35-
#define GPUCA_COMP_GATHER_KERNEL 4
36-
#define GPUCA_COMP_GATHER_MODE 3
37-
#elif defined(GPUCA_GPUTYPE_VEGA)
38-
#define GPUCA_NEIGHBOURS_FINDER_MAX_NNEIGHUP 5
39-
#define GPUCA_TRACKLET_SELECTOR_HITS_REG_SIZE 20
40-
#define GPUCA_ALTERNATE_BORDER_SORT 1
41-
#define GPUCA_SORT_BEFORE_FIT 1
42-
#define GPUCA_MERGER_SPLIT_LOOP_INTERPOLATION 1
43-
#define GPUCA_NO_ATOMIC_PRECHECK 1
44-
#define GPUCA_DEDX_STORAGE_TYPE uint16_t
45-
#define GPUCA_MERGER_INTERPOLATION_ERROR_TYPE half
46-
#define GPUCA_COMP_GATHER_KERNEL 4
47-
#define GPUCA_COMP_GATHER_MODE 3
48-
#elif defined(GPUCA_GPUTYPE_AMPERE)
49-
#define GPUCA_NEIGHBOURS_FINDER_MAX_NNEIGHUP 4
50-
#define GPUCA_TRACKLET_SELECTOR_HITS_REG_SIZE 20
51-
#define GPUCA_ALTERNATE_BORDER_SORT 1
52-
#define GPUCA_SORT_BEFORE_FIT 1
53-
#define GPUCA_MERGER_SPLIT_LOOP_INTERPOLATION 1
54-
#define GPUCA_NO_ATOMIC_PRECHECK 1
55-
#define GPUCA_DEDX_STORAGE_TYPE uint16_t
56-
#define GPUCA_MERGER_INTERPOLATION_ERROR_TYPE half
57-
#define GPUCA_COMP_GATHER_KERNEL 4
58-
#define GPUCA_COMP_GATHER_MODE 3
59-
#elif defined(GPUCA_GPUTYPE_TURING)
60-
#define GPUCA_NEIGHBOURS_FINDER_MAX_NNEIGHUP 4
61-
#define GPUCA_TRACKLET_SELECTOR_HITS_REG_SIZE 20
62-
#define GPUCA_ALTERNATE_BORDER_SORT 1
63-
#define GPUCA_SORT_BEFORE_FIT 1
64-
#define GPUCA_MERGER_SPLIT_LOOP_INTERPOLATION 1
65-
#define GPUCA_NO_ATOMIC_PRECHECK 1
66-
#define GPUCA_COMP_GATHER_KERNEL 4
67-
#define GPUCA_COMP_GATHER_MODE 3
68-
#define GPUCA_DEDX_STORAGE_TYPE uint16_t
69-
#define GPUCA_MERGER_INTERPOLATION_ERROR_TYPE half
70-
#endif
71-
#endif
72-
73-
#ifdef GPUCA_GPUCODE
25+
#if defined(GPUCA_GPUCODE)
7426
#include "GPUDefParametersDefaults.h"
7527
#endif
7628
#include "GPUDefParametersConstants.h"

0 commit comments

Comments
 (0)