summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--prelude/slang-cpp-scalar-intrinsics.h2
-rw-r--r--source/slang/slang-emit-c-like.cpp3
-rw-r--r--source/slang/slang-emit-cpp.cpp3
-rw-r--r--source/slang/slang-emit-cpp.h3
-rw-r--r--source/slang/slang-emit-glsl.cpp31
-rw-r--r--source/slang/slang-emit-precedence.cpp3
-rw-r--r--source/slang/slang-emit-precedence.h2
-rw-r--r--source/slang/slang-ir-constexpr.cpp3
-rw-r--r--source/slang/slang-ir-inst-defs.h17
-rw-r--r--source/slang/slang-ir.cpp2
-rw-r--r--source/slang/slang-lower-to-ir.cpp3
-rw-r--r--source/slang/slang-stdlib.cpp6
-rw-r--r--tests/compute/frem.slang29
-rw-r--r--tests/compute/frem.slang.2.expected.txt4
-rw-r--r--tests/compute/frem.slang.expected.txt4
-rw-r--r--tools/render-test/shader-input-layout.cpp12
16 files changed, 113 insertions, 14 deletions
diff --git a/prelude/slang-cpp-scalar-intrinsics.h b/prelude/slang-cpp-scalar-intrinsics.h
index 8809d9575..081b31265 100644
--- a/prelude/slang-cpp-scalar-intrinsics.h
+++ b/prelude/slang-cpp-scalar-intrinsics.h
@@ -62,6 +62,7 @@ SLANG_FORCE_INLINE float F32_min(float a, float b) { return a < b ? a : b; }
SLANG_FORCE_INLINE float F32_max(float a, float b) { return a > b ? a : b; }
SLANG_FORCE_INLINE float F32_pow(float a, float b) { return ::powf(a, b); }
SLANG_FORCE_INLINE float F32_fmod(float a, float b) { return ::fmodf(a, b); }
+SLANG_FORCE_INLINE float F32_remainder(float a, float b) { return ::remainderf(a, b); }
SLANG_FORCE_INLINE float F32_step(float a, float b) { return float(a >= b); }
SLANG_FORCE_INLINE float F32_atan2(float a, float b) { return float(atan2(a, b)); }
@@ -110,6 +111,7 @@ SLANG_FORCE_INLINE double F64_min(double a, double b) { return a < b ? a : b; }
SLANG_FORCE_INLINE double F64_max(double a, double b) { return a > b ? a : b; }
SLANG_FORCE_INLINE double F64_pow(double a, double b) { return ::pow(a, b); }
SLANG_FORCE_INLINE double F64_fmod(double a, double b) { return ::fmod(a, b); }
+SLANG_FORCE_INLINE double F64_remainder(double a, double b) { return ::remainder(a, b); }
SLANG_FORCE_INLINE double F64_step(double a, double b) { return double(a >= b); }
SLANG_FORCE_INLINE double F64_atan2(double a, double b) { return atan2(a, b); }
diff --git a/source/slang/slang-emit-c-like.cpp b/source/slang/slang-emit-c-like.cpp
index 870523a3b..a19823055 100644
--- a/source/slang/slang-emit-c-like.cpp
+++ b/source/slang/slang-emit-c-like.cpp
@@ -1772,7 +1772,8 @@ void CLikeSourceEmitter::defaultEmitInstExpr(IRInst* inst, const EmitOpInfo& inO
case kIROp_Add:
case kIROp_Sub:
case kIROp_Div:
- case kIROp_Mod:
+ case kIROp_IRem:
+ case kIROp_FRem:
case kIROp_Lsh:
case kIROp_Rsh:
case kIROp_BitXor:
diff --git a/source/slang/slang-emit-cpp.cpp b/source/slang/slang-emit-cpp.cpp
index 8f3e2f2e5..dfc07aecf 100644
--- a/source/slang/slang-emit-cpp.cpp
+++ b/source/slang/slang-emit-cpp.cpp
@@ -217,7 +217,8 @@ static const CPPSourceEmitter::OperationInfo s_operationInfos[] =
case kIROp_Div: return IntrinsicOp::Div;
case kIROp_Lsh: return IntrinsicOp::Lsh;
case kIROp_Rsh: return IntrinsicOp::Rsh;
- case kIROp_Mod: return IntrinsicOp::Mod;
+ case kIROp_IRem: return IntrinsicOp::IRem;
+ case kIROp_FRem: return IntrinsicOp::FRem;
case kIROp_Eql: return IntrinsicOp::Eql;
case kIROp_Neq: return IntrinsicOp::Neq;
diff --git a/source/slang/slang-emit-cpp.h b/source/slang/slang-emit-cpp.h
index f15a302e5..0e182818d 100644
--- a/source/slang/slang-emit-cpp.h
+++ b/source/slang/slang-emit-cpp.h
@@ -38,7 +38,8 @@ just constructXXXFromScalar. Would be good if there was a suitable name to encom
x(Sub, "-", 2) \
x(Lsh, "<<", 2) \
x(Rsh, ">>", 2) \
- x(Mod, "%", 2) \
+ x(IRem, "%", 2) \
+ x(FRem, "remainder", 2) \
\
x(Eql, "==", 2) \
x(Neq, "!=", 2) \
diff --git a/source/slang/slang-emit-glsl.cpp b/source/slang/slang-emit-glsl.cpp
index d3c852fd6..a1c7b9170 100644
--- a/source/slang/slang-emit-glsl.cpp
+++ b/source/slang/slang-emit-glsl.cpp
@@ -1171,7 +1171,36 @@ bool GLSLSourceEmitter::tryEmitInstExprImpl(IRInst* inst, const EmitOpInfo& inOu
// Use the default
break;
}
-
+ case kIROp_FRem:
+ {
+ IRInst* left = inst->getOperand(0);
+ IRInst* right = inst->getOperand(1);
+
+ // Handle as a function call
+ auto prec = getInfo(EmitOp::Postfix);
+
+ EmitOpInfo outerPrec = inOuterPrec;
+ bool needClose = maybeEmitParens(outerPrec, outerPrec);
+
+ // TODO: the GLSL `mod` function amounts to a floating-point
+ // modulus rather than a floating-point remainder. We need
+ // to fix this to emit the right SPIR-V opcode, but there is
+ // no built-in GLSL function that maps to the opcode we want.
+ //
+ m_writer->emit("mod(");
+ emitOperand(left, getInfo(EmitOp::General));
+ m_writer->emit(",");
+ emitOperand(right, getInfo(EmitOp::General));
+ m_writer->emit(")");
+
+ maybeCloseParens(needClose);
+
+ return true;
+ }
+ // TODO: We should also special-case `kIROp_IRem` here,
+ // so that we emit a remainder instead of a modulus. As for
+ // `FRem` there is no direct GLSL translation, so we will
+ // leave things with the default behavior for now.
default: break;
}
diff --git a/source/slang/slang-emit-precedence.cpp b/source/slang/slang-emit-precedence.cpp
index 8237b31df..212abeb13 100644
--- a/source/slang/slang-emit-precedence.cpp
+++ b/source/slang/slang-emit-precedence.cpp
@@ -19,7 +19,8 @@ EmitOp getEmitOpForOp(IROp op)
case kIROp_Sub: return EmitOp::Sub;
case kIROp_Mul: return EmitOp::Mul;
case kIROp_Div: return EmitOp::Div;
- case kIROp_Mod: return EmitOp::Mod;
+ case kIROp_IRem: return EmitOp::Rem;
+ case kIROp_FRem: return EmitOp::Rem;
case kIROp_Lsh: return EmitOp::Lsh;
case kIROp_Rsh: return EmitOp::Rsh;
diff --git a/source/slang/slang-emit-precedence.h b/source/slang/slang-emit-precedence.h
index e44c75f5b..1c8081079 100644
--- a/source/slang/slang-emit-precedence.h
+++ b/source/slang/slang-emit-precedence.h
@@ -102,7 +102,7 @@ enum EPrecedence
\
x(Mul, "*", Multiplicative) \
x(Div, "/", Multiplicative) \
- x(Mod, "%", Multiplicative) \
+ x(Rem, "%", Multiplicative) \
\
x(Prefix, "", Prefix) \
x(Postfix, "", Postfix) \
diff --git a/source/slang/slang-ir-constexpr.cpp b/source/slang/slang-ir-constexpr.cpp
index d903ff880..041258153 100644
--- a/source/slang/slang-ir-constexpr.cpp
+++ b/source/slang/slang-ir-constexpr.cpp
@@ -73,7 +73,8 @@ bool opCanBeConstExpr(IROp op)
case kIROp_Sub:
case kIROp_Mul:
case kIROp_Div:
- case kIROp_Mod:
+ case kIROp_IRem:
+ case kIROp_FRem:
case kIROp_Neg:
case kIROp_Construct:
case kIROp_makeVector:
diff --git a/source/slang/slang-ir-inst-defs.h b/source/slang/slang-ir-inst-defs.h
index 131393ea6..49b6138ed 100644
--- a/source/slang/slang-ir-inst-defs.h
+++ b/source/slang/slang-ir-inst-defs.h
@@ -330,11 +330,23 @@ INST(SwizzledStore, swizzledStore, 2, 0)
INST_RANGE(TerminatorInst, ReturnVal, Unreachable)
+// TODO: We should consider splitting the basic arithmetic/comparison
+// ops into cases for signed integers, unsigned integers, and floating-point
+// values, to better match downstream targets that want to treat them
+// all differently (e.g., SPIR-V).
+
INST(Add, add, 2, 0)
INST(Sub, sub, 2, 0)
INST(Mul, mul, 2, 0)
INST(Div, div, 2, 0)
-INST(Mod, mod, 2, 0)
+
+// Remainder of division.
+//
+// Note: this is distinct from modulus, and we should have a separate
+// opcode for `mod` if we ever need to support it.
+//
+INST(IRem, irem, 2, 0) // integer (signed or unsigned)
+INST(FRem, frem, 2, 0) // floating-point
INST(Lsh, shl, 2, 0)
INST(Rsh, shr, 2, 0)
@@ -461,7 +473,8 @@ PSEUDO_INST(AddAssign)
PSEUDO_INST(SubAssign)
PSEUDO_INST(MulAssign)
PSEUDO_INST(DivAssign)
-PSEUDO_INST(ModAssign)
+PSEUDO_INST(IRemAssign)
+PSEUDO_INST(FRemAssign)
PSEUDO_INST(AndAssign)
PSEUDO_INST(OrAssign)
PSEUDO_INST(XorAssign )
diff --git a/source/slang/slang-ir.cpp b/source/slang/slang-ir.cpp
index b6c88bb99..ea6a4afda 100644
--- a/source/slang/slang-ir.cpp
+++ b/source/slang/slang-ir.cpp
@@ -4408,7 +4408,7 @@ namespace Slang
case kIROp_Sub:
case kIROp_Mul:
//case kIROp_Div: // TODO: We could split out integer vs. floating-point div/mod and assume the floating-point cases have no side effects
- //case kIROp_Mod:
+ //case kIROp_Rem:
case kIROp_Lsh:
case kIROp_Rsh:
case kIROp_Eql:
diff --git a/source/slang/slang-lower-to-ir.cpp b/source/slang/slang-lower-to-ir.cpp
index e41be0e33..1edd7d331 100644
--- a/source/slang/slang-lower-to-ir.cpp
+++ b/source/slang/slang-lower-to-ir.cpp
@@ -717,7 +717,8 @@ LoweredValInfo emitCallToDeclRef(
CASE(kIRPseudoOp_SubAssign, kIROp_Sub);
CASE(kIRPseudoOp_MulAssign, kIROp_Mul);
CASE(kIRPseudoOp_DivAssign, kIROp_Div);
- CASE(kIRPseudoOp_ModAssign, kIROp_Mod);
+ CASE(kIRPseudoOp_IRemAssign,kIROp_IRem);
+ CASE(kIRPseudoOp_FRemAssign,kIROp_FRem);
CASE(kIRPseudoOp_AndAssign, kIROp_BitAnd);
CASE(kIRPseudoOp_OrAssign, kIROp_BitOr);
CASE(kIRPseudoOp_XorAssign, kIROp_BitXor);
diff --git a/source/slang/slang-stdlib.cpp b/source/slang/slang-stdlib.cpp
index 036a40ac2..c1a9d59d2 100644
--- a/source/slang/slang-stdlib.cpp
+++ b/source/slang/slang-stdlib.cpp
@@ -216,7 +216,8 @@ namespace Slang
{ kIROp_Sub, "-", ARITHMETIC_MASK },
{ kIROp_Mul, "*", ARITHMETIC_MASK },
{ kIROp_Div, "/", ARITHMETIC_MASK },
- { kIROp_Mod, "%", INT_MASK },
+ { kIROp_IRem, "%", INT_MASK },
+ { kIROp_FRem, "%", FLOAT_MASK },
{ kIROp_And, "&&", BOOL_MASK | BOOL_RESULT},
{ kIROp_Or, "||", BOOL_MASK | BOOL_RESULT },
{ kIROp_BitAnd, "&", LOGICAL_MASK },
@@ -234,7 +235,8 @@ namespace Slang
{ kIRPseudoOp_SubAssign, "-=", ASSIGNMENT | ARITHMETIC_MASK },
{ kIRPseudoOp_MulAssign, "*=", ASSIGNMENT | ARITHMETIC_MASK },
{ kIRPseudoOp_DivAssign, "/=", ASSIGNMENT | ARITHMETIC_MASK },
- { kIRPseudoOp_ModAssign, "%=", ASSIGNMENT | ARITHMETIC_MASK },
+ { kIRPseudoOp_IRemAssign, "%=", ASSIGNMENT | INT_MASK },
+ { kIRPseudoOp_FRemAssign, "%=", ASSIGNMENT | FLOAT_MASK },
{ kIRPseudoOp_AndAssign, "&=", ASSIGNMENT | LOGICAL_MASK },
{ kIRPseudoOp_OrAssign, "|=", ASSIGNMENT | LOGICAL_MASK },
{ kIRPseudoOp_XorAssign, "^=", ASSIGNMENT | LOGICAL_MASK },
diff --git a/tests/compute/frem.slang b/tests/compute/frem.slang
new file mode 100644
index 000000000..60012ea1e
--- /dev/null
+++ b/tests/compute/frem.slang
@@ -0,0 +1,29 @@
+// frem.slang
+
+//TEST(compute):COMPARE_COMPUTE:
+//TEST(compute):COMPARE_COMPUTE:-cpu
+//TEST(compute):COMPARE_COMPUTE:-vk
+
+// Test uses of floating-point `%` operator.
+
+RWStructuredBuffer<float> gInput;
+//TEST_INPUT:ubuffer(data=[2.0 1.0 5.0 2.0 2.0 -4.0 -5.0 2.0], stride=4):dxbinding(0),glbinding(0),name=gInput
+
+int test(int inVal)
+{
+ float a = gInput[inVal*2];
+ float b = gInput[inVal*2 + 1];
+ return int(a % b);
+}
+
+//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):dxbinding(1),glbinding(1),out,name=outputBuffer
+RWStructuredBuffer<int> outputBuffer;
+
+[numthreads(4, 1, 1)]
+void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID)
+{
+ uint tid = dispatchThreadID.x;
+ int inVal = tid;
+ int outVal = test(inVal);
+ outputBuffer[tid] = outVal;
+} \ No newline at end of file
diff --git a/tests/compute/frem.slang.2.expected.txt b/tests/compute/frem.slang.2.expected.txt
new file mode 100644
index 000000000..f22b9c805
--- /dev/null
+++ b/tests/compute/frem.slang.2.expected.txt
@@ -0,0 +1,4 @@
+0
+1
+FFFFFFFE
+1
diff --git a/tests/compute/frem.slang.expected.txt b/tests/compute/frem.slang.expected.txt
new file mode 100644
index 000000000..bafada4d1
--- /dev/null
+++ b/tests/compute/frem.slang.expected.txt
@@ -0,0 +1,4 @@
+0
+1
+2
+FFFFFFFF
diff --git a/tools/render-test/shader-input-layout.cpp b/tools/render-test/shader-input-layout.cpp
index 11c87c0d9..0d13e5ca1 100644
--- a/tools/render-test/shader-input-layout.cpp
+++ b/tools/render-test/shader-input-layout.cpp
@@ -390,13 +390,23 @@ namespace renderer_test
parser.Read("[");
while (!parser.IsEnd() && !parser.LookAhead("]"))
{
+ bool negate = false;
+ if(parser.NextToken().Type == TokenType::OpSub)
+ {
+ parser.ReadToken();
+ negate = true;
+ }
+
if (parser.NextToken().Type == TokenType::IntLiteral)
{
- entry.bufferData.add(parser.ReadUInt());
+ uint32_t val = parser.ReadUInt();
+ if(negate) val = uint32_t(-int32_t(val));
+ entry.bufferData.add(val);
}
else
{
auto floatNum = parser.ReadFloat();
+ if(negate) floatNum = -floatNum;
entry.bufferData.add(*(unsigned int*)&floatNum);
}
}
generated by cgit v1.2.3 (git 2.39.1) at 2026-06-01 20:37:45 +0000