Skip to content

Commit 4cc7d90

Browse files
committed
WA for IGC-17746 miscompile
1 parent d12a195 commit 4cc7d90

2 files changed

Lines changed: 36 additions & 31 deletions

File tree

‎openvkl/devices/gpu/compute/vklComputeParticle.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ namespace ispc {
3636
uint64 numIds,
3737
uint64 *ids,
3838
vec3f &result,
39-
vec3f samplePos)
39+
const vec3f &samplePos)
4040
{
4141
const VKLParticleVolume *self = (const VKLParticleVolume *uniform)userData;
4242

@@ -59,7 +59,7 @@ namespace ispc {
5959
uint64 numIds,
6060
uint64 *ids,
6161
float &result,
62-
vec3f samplePos)
62+
const vec3f &samplePos)
6363
{
6464
const VKLParticleVolume *self = (const VKLParticleVolume *)userData;
6565

‎openvkl/devices/gpu/compute/vklComputeUnstructured.h‎

Lines changed: 34 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
#include "../../cpu/volume/UnstructuredBVH.ih"
77
#include "../../cpu/volume/UnstructuredVolumeShared.h"
88

9+
// WA for IGC-17746 miscompile: force inlining (and pass samplePos by const&)
10+
#define VKL_WA_IGC17746_INLINE __attribute__((always_inline)) inline
11+
912
namespace ispc {
1013

1114
////////////////////////////////////////////////////////////////////////////
@@ -113,11 +116,11 @@ namespace ispc {
113116
// intersect / sampling functions //////////////////////////////////////////
114117
////////////////////////////////////////////////////////////////////////////
115118

116-
inline bool intersectAndSampleTet(const void *userData,
117-
uint64_t id,
118-
bool assumeInside,
119-
float &result,
120-
vec3f samplePos)
119+
VKL_WA_IGC17746_INLINE bool intersectAndSampleTet(const void *userData,
120+
uint64_t id,
121+
bool assumeInside,
122+
float &result,
123+
const vec3f &samplePos)
121124
{
122125
const VKLUnstructuredVolume *self = (const VKLUnstructuredVolume *)userData;
123126

@@ -219,11 +222,11 @@ namespace ispc {
219222
static const float WEDGE_CONVERGED = 0.0001f;
220223
static const float WEDGE_OUTSIDE_CELL_TOLERANCE = 0.000001f;
221224

222-
inline bool intersectAndSampleWedge(const void *userData,
223-
uint64_t id,
224-
bool assumeInside,
225-
float &result,
226-
vec3f samplePos)
225+
VKL_WA_IGC17746_INLINE bool intersectAndSampleWedge(const void *userData,
226+
uint64_t id,
227+
bool assumeInside,
228+
float &result,
229+
const vec3f &samplePos)
227230
{
228231
const VKLUnstructuredVolume *self = (const VKLUnstructuredVolume *)userData;
229232

@@ -359,11 +362,11 @@ namespace ispc {
359362
static const float PYRAMID_CONVERGED = 0.0001f;
360363
static const float PYRAMID_OUTSIDE_CELL_TOLERANCE = 0.000001f;
361364

362-
inline bool intersectAndSamplePyramid(const void *userData,
363-
uint64_t id,
364-
bool assumeInside,
365-
float &result,
366-
vec3f samplePos)
365+
VKL_WA_IGC17746_INLINE bool intersectAndSamplePyramid(const void *userData,
366+
uint64_t id,
367+
bool assumeInside,
368+
float &result,
369+
const vec3f &samplePos)
367370
{
368371
const VKLUnstructuredVolume *self = (const VKLUnstructuredVolume *)userData;
369372

@@ -454,10 +457,10 @@ namespace ispc {
454457
return false;
455458
}
456459

457-
inline bool intersectAndSampleHexFast(const void *userData,
458-
uint64_t id,
459-
float &result,
460-
vec3f samplePos)
460+
VKL_WA_IGC17746_INLINE bool intersectAndSampleHexFast(const void *userData,
461+
uint64_t id,
462+
float &result,
463+
const vec3f &samplePos)
461464
{
462465
const VKLUnstructuredVolume *self = (const VKLUnstructuredVolume *)userData;
463466

@@ -570,11 +573,12 @@ namespace ispc {
570573
static const float HEX_CONVERGED = 0.0001f;
571574
static const float HEX_OUTSIDE_CELL_TOLERANCE = 0.000001f;
572575

573-
inline bool intersectAndSampleHexIterative(const void *userData,
574-
uint64_t id,
575-
bool assumeInside,
576-
float &result,
577-
vec3f samplePos)
576+
VKL_WA_IGC17746_INLINE bool intersectAndSampleHexIterative(
577+
const void *userData,
578+
uint64_t id,
579+
bool assumeInside,
580+
float &result,
581+
const vec3f &samplePos)
578582
{
579583
const VKLUnstructuredVolume *self = (const VKLUnstructuredVolume *)userData;
580584

@@ -665,11 +669,12 @@ namespace ispc {
665669
return false;
666670
}
667671

668-
inline bool intersectAndSampleCell(const void *userData,
669-
uint64_t id,
670-
float &result,
671-
vec3f samplePos,
672-
const VKLFeatureFlags featureFlags)
672+
VKL_WA_IGC17746_INLINE bool intersectAndSampleCell(
673+
const void *userData,
674+
uint64_t id,
675+
float &result,
676+
const vec3f &samplePos,
677+
const VKLFeatureFlags featureFlags)
673678
{
674679
bool hit = false;
675680

0 commit comments

Comments
 (0)