mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-11-16 02:59:49 +01:00
GPU: Keep the cull matrix in four registers in TestBoundingBoxFast
Splatted, the matrix took sixteen vector registers, and on ARM64 the compiler reloaded them from the stack every iteration. Multiplied by lane, it fits in four, with the same operations in the same order. About 14% fewer samples in the function in Colin McRae on a Cortex-A53, where it's the top C++ function on the emu thread. Most of what's left is waiting for the vertex loads. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
19b2894c2a
commit
5f50174440
2 files changed
+34
-9
No files matched your search
@@ -379,6 +379,9 @@ struct Vec4F32 {
|
||||
float operator[](size_t index) const { return ((float *)&v)[index]; }
|
||||
|
||||
Vec4F32 Mul(float f) const { return Vec4F32{ _mm_mul_ps(v, _mm_set1_ps(f)) }; }
|
||||
// Multiplies by one lane of m.
|
||||
template<int lane>
|
||||
Vec4F32 MulLane(Vec4F32 m) const { return Vec4F32{ _mm_mul_ps(v, _mm_shuffle_ps(m.v, m.v, _MM_SHUFFLE(lane, lane, lane, lane))) }; }
|
||||
Vec4F32 RecipApprox() const { return Vec4F32{ _mm_rcp_ps(v) }; }
|
||||
Vec4F32 Recip() const { return Vec4F32{ _mm_div_ps(_mm_set1_ps(1.0f), v) }; }
|
||||
Vec4F32 RecipSqrt() const { return Vec4F32{ _mm_div_ps(_mm_set1_ps(1.0f), _mm_sqrt_ps(v)) }; }
|
||||
@@ -837,6 +840,15 @@ struct Vec4F32 {
|
||||
void operator *=(float f) { v = vmulq_f32(v, vdupq_n_f32(f)); }
|
||||
|
||||
Vec4F32 Mul(float f) const { return Vec4F32{ vmulq_f32(v, vdupq_n_f32(f)) }; }
|
||||
// Multiplies by one lane of m.
|
||||
template<int lane>
|
||||
Vec4F32 MulLane(Vec4F32 m) const {
|
||||
#if PPSSPP_ARCH(ARM64_NEON)
|
||||
return Vec4F32{ vmulq_laneq_f32(v, m.v, lane) };
|
||||
#else
|
||||
return Vec4F32{ vmulq_lane_f32(v, lane < 2 ? vget_low_f32(m.v) : vget_high_f32(m.v), lane & 1) };
|
||||
#endif
|
||||
}
|
||||
|
||||
Vec4F32 Recip() const {
|
||||
float32x4_t recip = vrecpeq_f32(v);
|
||||
@@ -1428,6 +1440,9 @@ struct Vec4F32 {
|
||||
void operator *=(float f) { v = (__m128)__lsx_vfmul_s(v, __lsx_vreplfr2vr_s(f)); }
|
||||
|
||||
Vec4F32 Mul(float f) const { return Vec4F32{ (__m128)__lsx_vfmul_s(v, __lsx_vreplfr2vr_s(f)) }; }
|
||||
// Multiplies by one lane of m.
|
||||
template<int lane>
|
||||
Vec4F32 MulLane(Vec4F32 m) const { return Vec4F32{ (__m128)__lsx_vfmul_s(v, (__m128)__lsx_vreplvei_w((__m128i)m.v, lane)) }; }
|
||||
|
||||
Vec4F32 Recip() const {
|
||||
__m128 recip = (__m128)__lsx_vfrecip_s(v);
|
||||
@@ -2065,6 +2080,11 @@ struct Vec4F32 {
|
||||
Vec4F32 Mul(float f) const {
|
||||
return Vec4F32{ { v[0] * f, v[1] * f, v[2] * f, v[3] * f } };
|
||||
}
|
||||
// Multiplies by one lane of m.
|
||||
template<int lane>
|
||||
Vec4F32 MulLane(Vec4F32 m) const {
|
||||
return Mul(m.v[lane]);
|
||||
}
|
||||
|
||||
Vec4F32 Recip() const {
|
||||
return Vec4F32{ { 1.0f / v[0], 1.0f / v[1], 1.0f / v[2], 1.0f / v[3] } };
|
||||
|
||||
@@ -402,11 +402,16 @@ static inline Vec4F32 DivideExact(Vec4F32 a, Vec4F32 b) {
|
||||
// NOTE: This doesn't handle through-mode (morph or skinning can be handled if they're implemented in software during decode).
|
||||
template<u32 posFmt, u32 idxFmt>
|
||||
static bool TestBoundingBoxFast(const float *cullMatrix, const void *vdata, const void *idata, int vertexCount, const VertexDecoder *dec, ClipInfoFlags *clipInfoFlags) {
|
||||
// Four vertices at a time, one per lane, with the matrix splatted. Past the end, the last vertex fills the lanes,
|
||||
// which changes nothing.
|
||||
Vec4F32 m[16];
|
||||
for (int i = 0; i < 16; i++)
|
||||
m[i] = Vec4F32::Splat(cullMatrix[i]);
|
||||
// Four vertices at a time, one per lane. Past the end, the last vertex fills the lanes, which changes nothing.
|
||||
// The matrix stays in four registers, multiplied by lane. Splatted, it took sixteen, and was reloaded from the
|
||||
// stack every iteration.
|
||||
const Vec4F32 col0 = Vec4F32::Load(cullMatrix);
|
||||
const Vec4F32 col1 = Vec4F32::Load(cullMatrix + 4);
|
||||
const Vec4F32 col2 = Vec4F32::Load(cullMatrix + 8);
|
||||
const Vec4F32 tx = Vec4F32::Splat(cullMatrix[12]);
|
||||
const Vec4F32 ty = Vec4F32::Splat(cullMatrix[13]);
|
||||
const Vec4F32 tz = Vec4F32::Splat(cullMatrix[14]);
|
||||
const Vec4F32 tw = Vec4F32::Splat(cullMatrix[15]);
|
||||
|
||||
// For each side of the clipping cube, whether any vertex is inside it, and whether any is outside the Z sides.
|
||||
Vec4S32 insideLeft = Vec4S32::Zero();
|
||||
@@ -434,10 +439,10 @@ static bool TestBoundingBoxFast(const float *cullMatrix, const void *vdata, cons
|
||||
Vec4F32::Transpose(objX, objY, objZ, unused);
|
||||
|
||||
// The same operations in the same order as AsVec3ByMatrix44(), so the same rounding.
|
||||
const Vec4F32 x = (m[0] * objX + m[4] * objY) + (m[8] * objZ + m[12]);
|
||||
const Vec4F32 y = (m[1] * objX + m[5] * objY) + (m[9] * objZ + m[13]);
|
||||
const Vec4F32 z = (m[2] * objX + m[6] * objY) + (m[10] * objZ + m[14]);
|
||||
const Vec4F32 w = (m[3] * objX + m[7] * objY) + (m[11] * objZ + m[15]);
|
||||
const Vec4F32 x = (objX.MulLane<0>(col0) + objY.MulLane<0>(col1)) + (objZ.MulLane<0>(col2) + tx);
|
||||
const Vec4F32 y = (objX.MulLane<1>(col0) + objY.MulLane<1>(col1)) + (objZ.MulLane<1>(col2) + ty);
|
||||
const Vec4F32 z = (objX.MulLane<2>(col0) + objY.MulLane<2>(col1)) + (objZ.MulLane<2>(col2) + tz);
|
||||
const Vec4F32 w = (objX.MulLane<3>(col0) + objY.MulLane<3>(col1)) + (objZ.MulLane<3>(col2) + tw);
|
||||
|
||||
insideLeft |= (x + w).CompareGe(zero);
|
||||
insideRight |= (w - x).CompareGe(zero);
|
||||
|
||||
Reference in new issue
Block a user