summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rw-r--r--source/slang/check.cpp14
-rw-r--r--source/slang/compiler.h3
-rw-r--r--source/slang/core.meta.slang6
-rw-r--r--source/slang/core.meta.slang.h9
-rw-r--r--source/slang/diagnostic-defs.h2
-rw-r--r--source/slang/emit.cpp7
-rw-r--r--source/slang/hlsl.meta.slang32
-rw-r--r--source/slang/hlsl.meta.slang.h32
-rw-r--r--source/slang/ir-inst-defs.h1
-rw-r--r--source/slang/ir-insts.h1
-rw-r--r--source/slang/ir.cpp5
-rw-r--r--source/slang/ir.h1
-rw-r--r--source/slang/lower-to-ir.cpp59
-rw-r--r--source/slang/modifier-defs.h4
-rw-r--r--source/slang/parser.cpp1
-rw-r--r--source/slang/syntax.cpp11
-rw-r--r--source/slang/type-defs.h4
17 files changed, 154 insertions, 38 deletions
diff --git a/source/slang/check.cpp b/source/slang/check.cpp
index 19e349807..c3eb44cfd 100644
--- a/source/slang/check.cpp
+++ b/source/slang/check.cpp
@@ -3011,6 +3011,11 @@ namespace Slang
// because there is no way for overload resolution to pick between them.
if (fstParam.getDecl()->HasModifier<OutModifier>() != sndParam.getDecl()->HasModifier<OutModifier>())
return false;
+
+ // If one parameter is `ref` and the other isn't, then they don't match.
+ //
+ if(fstParam.getDecl()->HasModifier<RefModifier>() != sndParam.getDecl()->HasModifier<RefModifier>())
+ return false;
}
// Note(tfoley): return type doesn't enter into it, because we can't take
@@ -7046,8 +7051,15 @@ namespace Slang
for (UInt pp = 0; pp < paramCount; ++pp)
{
auto paramType = funcType->getParamType(pp);
- if (auto outParamType = paramType->As<OutTypeBase>())
+ if (paramType->As<OutTypeBase>() || paramType->As<RefType>())
{
+ // `out`, `inout`, and `ref` parameters currently require
+ // an *exact* match on the type of the argument.
+ //
+ // TODO: relax this requirement by allowing an argument
+ // for an `inout` parameter to be converted in both
+ // directions.
+ //
if( pp < expr->Arguments.Count() )
{
auto argExpr = expr->Arguments[pp];
diff --git a/source/slang/compiler.h b/source/slang/compiler.h
index e7c40bdc8..526168e3a 100644
--- a/source/slang/compiler.h
+++ b/source/slang/compiler.h
@@ -520,6 +520,9 @@ namespace Slang
// Construct the type `InOut<valueType>`
RefPtr<InOutType> getInOutType(RefPtr<Type> valueType);
+ // Construct the type `Ref<valueType>`
+ RefPtr<RefType> getRefType(RefPtr<Type> valueType);
+
// Construct a pointer type like `Ptr<valueType>`, but where
// the actual type name for the pointer type is given by `ptrTypeName`
RefPtr<PtrTypeBase> getPtrType(RefPtr<Type> valueType, char const* ptrTypeName);
diff --git a/source/slang/core.meta.slang b/source/slang/core.meta.slang
index 35ad77f4f..00afde2ac 100644
--- a/source/slang/core.meta.slang
+++ b/source/slang/core.meta.slang
@@ -117,6 +117,12 @@ __intrinsic_type($(kIROp_InOutType))
struct InOut
{};
+__generic<T>
+__magic_type(RefType)
+__intrinsic_type($(kIROp_RefType))
+struct Ref
+{};
+
__magic_type(StringType)
__intrinsic_type($(kIROp_StringType))
struct String
diff --git a/source/slang/core.meta.slang.h b/source/slang/core.meta.slang.h
index bbb258d15..95c6ff0f7 100644
--- a/source/slang/core.meta.slang.h
+++ b/source/slang/core.meta.slang.h
@@ -126,6 +126,15 @@ SLANG_RAW(")\n")
SLANG_RAW("struct InOut\n")
SLANG_RAW("{};\n")
SLANG_RAW("\n")
+SLANG_RAW("__generic<T>\n")
+SLANG_RAW("__magic_type(RefType)\n")
+SLANG_RAW("__intrinsic_type(")
+SLANG_SPLICE(kIROp_RefType
+)
+SLANG_RAW(")\n")
+SLANG_RAW("struct Ref\n")
+SLANG_RAW("{};\n")
+SLANG_RAW("\n")
SLANG_RAW("__magic_type(StringType)\n")
SLANG_RAW("__intrinsic_type(")
SLANG_SPLICE(kIROp_StringType
diff --git a/source/slang/diagnostic-defs.h b/source/slang/diagnostic-defs.h
index f531ae851..2bfed3d52 100644
--- a/source/slang/diagnostic-defs.h
+++ b/source/slang/diagnostic-defs.h
@@ -311,6 +311,8 @@ DIAGNOSTIC(40006, Error, needCompileTimeConstant, "expected a compile-time const
DIAGNOSTIC(40007, Internal, irValidationFailed, "IR validation failed: $0")
+DIAGNOSTIC(40008, Error, invalidLValueForRefParameter, "the form of this l-value argument is not valid for a `ref` parameter")
+
// 41000 - IR-level validation issues
DIAGNOSTIC(41000, Warning, unreachableCode, "unreachable code detected")
diff --git a/source/slang/emit.cpp b/source/slang/emit.cpp
index 3e601e119..af2fa68dc 100644
--- a/source/slang/emit.cpp
+++ b/source/slang/emit.cpp
@@ -4408,6 +4408,13 @@ struct EmitVisitor
emit("inout ");
type = inOutType->getValueType();
}
+ else if( auto refType = as<IRRefType>(type))
+ {
+ // Note: There is no HLSL/GLSL equivalent for by-reference parameters,
+ // so we don't actually expect to encounter these in user code.
+ emit("inout ");
+ type = inOutType->getValueType();
+ }
emitIRType(ctx, type, name);
}
diff --git a/source/slang/hlsl.meta.slang b/source/slang/hlsl.meta.slang
index bf235eb3c..152e9faa1 100644
--- a/source/slang/hlsl.meta.slang
+++ b/source/slang/hlsl.meta.slang
@@ -617,32 +617,32 @@ __target_intrinsic(glsl, "groupMemoryBarrier()); (barrier()")
void GroupMemoryBarrierWithGroupSync();
// Atomics
-void InterlockedAdd(in out int dest, int value, out int original_value);
-void InterlockedAdd(in out uint dest, uint value, out uint original_value);
+void InterlockedAdd(__ref int dest, int value, out int original_value);
+void InterlockedAdd(__ref uint dest, uint value, out uint original_value);
-void InterlockedAnd(in out int dest, int value, out int original_value);
-void InterlockedAnd(in out uint dest, uint value, out uint original_value);
+void InterlockedAnd(__ref int dest, int value, out int original_value);
+void InterlockedAnd(__ref uint dest, uint value, out uint original_value);
-void InterlockedCompareExchange(in out int dest, int compare_value, int value, out int original_value);
-void InterlockedCompareExchange(in out uint dest, uint compare_value, uint value, out uint original_value);
+void InterlockedCompareExchange(__ref int dest, int compare_value, int value, out int original_value);
+void InterlockedCompareExchange(__ref uint dest, uint compare_value, uint value, out uint original_value);
-void InterlockedCompareStore(in out int dest, int compare_value, int value);
-void InterlockedCompareStore(in out uint dest, uint compare_value, uint value);
+void InterlockedCompareStore(__ref int dest, int compare_value, int value);
+void InterlockedCompareStore(__ref uint dest, uint compare_value, uint value);
-void InterlockedExchange(in out int dest, int value, out int original_value);
-void InterlockedExchange(in out uint dest, uint value, out uint original_value);
+void InterlockedExchange(__ref int dest, int value, out int original_value);
+void InterlockedExchange(__ref uint dest, uint value, out uint original_value);
-void InterlockedMax(in out int dest, int value, out int original_value);
-void InterlockedMax(in out uint dest, uint value, out uint original_value);
+void InterlockedMax(__ref int dest, int value, out int original_value);
+void InterlockedMax(__ref uint dest, uint value, out uint original_value);
void InterlockedMin(in out int dest, int value, out int original_value);
void InterlockedMin(in out uint dest, uint value, out uint original_value);
-void InterlockedOr(in out int dest, int value, out int original_value);
-void InterlockedOr(in out uint dest, uint value, out uint original_value);
+void InterlockedOr(__ref int dest, int value, out int original_value);
+void InterlockedOr(__ref uint dest, uint value, out uint original_value);
-void InterlockedXor(in out int dest, int value, out int original_value);
-void InterlockedXor(in out uint dest, uint value, out uint original_value);
+void InterlockedXor(__ref int dest, int value, out int original_value);
+void InterlockedXor(__ref uint dest, uint value, out uint original_value);
// Is floating-point value finite?
__generic<T : __BuiltinFloatingPointType> bool isfinite(T x);
diff --git a/source/slang/hlsl.meta.slang.h b/source/slang/hlsl.meta.slang.h
index a1e40c37b..ba4998b23 100644
--- a/source/slang/hlsl.meta.slang.h
+++ b/source/slang/hlsl.meta.slang.h
@@ -650,32 +650,32 @@ SLANG_RAW("__target_intrinsic(glsl, \"groupMemoryBarrier()); (barrier()\")\n")
SLANG_RAW("void GroupMemoryBarrierWithGroupSync();\n")
SLANG_RAW("\n")
SLANG_RAW("// Atomics\n")
-SLANG_RAW("void InterlockedAdd(in out int dest, int value, out int original_value);\n")
-SLANG_RAW("void InterlockedAdd(in out uint dest, uint value, out uint original_value);\n")
+SLANG_RAW("void InterlockedAdd(__ref int dest, int value, out int original_value);\n")
+SLANG_RAW("void InterlockedAdd(__ref uint dest, uint value, out uint original_value);\n")
SLANG_RAW("\n")
-SLANG_RAW("void InterlockedAnd(in out int dest, int value, out int original_value);\n")
-SLANG_RAW("void InterlockedAnd(in out uint dest, uint value, out uint original_value);\n")
+SLANG_RAW("void InterlockedAnd(__ref int dest, int value, out int original_value);\n")
+SLANG_RAW("void InterlockedAnd(__ref uint dest, uint value, out uint original_value);\n")
SLANG_RAW("\n")
-SLANG_RAW("void InterlockedCompareExchange(in out int dest, int compare_value, int value, out int original_value);\n")
-SLANG_RAW("void InterlockedCompareExchange(in out uint dest, uint compare_value, uint value, out uint original_value);\n")
+SLANG_RAW("void InterlockedCompareExchange(__ref int dest, int compare_value, int value, out int original_value);\n")
+SLANG_RAW("void InterlockedCompareExchange(__ref uint dest, uint compare_value, uint value, out uint original_value);\n")
SLANG_RAW("\n")
-SLANG_RAW("void InterlockedCompareStore(in out int dest, int compare_value, int value);\n")
-SLANG_RAW("void InterlockedCompareStore(in out uint dest, uint compare_value, uint value);\n")
+SLANG_RAW("void InterlockedCompareStore(__ref int dest, int compare_value, int value);\n")
+SLANG_RAW("void InterlockedCompareStore(__ref uint dest, uint compare_value, uint value);\n")
SLANG_RAW("\n")
-SLANG_RAW("void InterlockedExchange(in out int dest, int value, out int original_value);\n")
-SLANG_RAW("void InterlockedExchange(in out uint dest, uint value, out uint original_value);\n")
+SLANG_RAW("void InterlockedExchange(__ref int dest, int value, out int original_value);\n")
+SLANG_RAW("void InterlockedExchange(__ref uint dest, uint value, out uint original_value);\n")
SLANG_RAW("\n")
-SLANG_RAW("void InterlockedMax(in out int dest, int value, out int original_value);\n")
-SLANG_RAW("void InterlockedMax(in out uint dest, uint value, out uint original_value);\n")
+SLANG_RAW("void InterlockedMax(__ref int dest, int value, out int original_value);\n")
+SLANG_RAW("void InterlockedMax(__ref uint dest, uint value, out uint original_value);\n")
SLANG_RAW("\n")
SLANG_RAW("void InterlockedMin(in out int dest, int value, out int original_value);\n")
SLANG_RAW("void InterlockedMin(in out uint dest, uint value, out uint original_value);\n")
SLANG_RAW("\n")
-SLANG_RAW("void InterlockedOr(in out int dest, int value, out int original_value);\n")
-SLANG_RAW("void InterlockedOr(in out uint dest, uint value, out uint original_value);\n")
+SLANG_RAW("void InterlockedOr(__ref int dest, int value, out int original_value);\n")
+SLANG_RAW("void InterlockedOr(__ref uint dest, uint value, out uint original_value);\n")
SLANG_RAW("\n")
-SLANG_RAW("void InterlockedXor(in out int dest, int value, out int original_value);\n")
-SLANG_RAW("void InterlockedXor(in out uint dest, uint value, out uint original_value);\n")
+SLANG_RAW("void InterlockedXor(__ref int dest, int value, out int original_value);\n")
+SLANG_RAW("void InterlockedXor(__ref uint dest, uint value, out uint original_value);\n")
SLANG_RAW("\n")
SLANG_RAW("// Is floating-point value finite?\n")
SLANG_RAW("__generic<T : __BuiltinFloatingPointType> bool isfinite(T x);\n")
diff --git a/source/slang/ir-inst-defs.h b/source/slang/ir-inst-defs.h
index 035defa53..0b7d15fcc 100644
--- a/source/slang/ir-inst-defs.h
+++ b/source/slang/ir-inst-defs.h
@@ -65,6 +65,7 @@ INST(Nop, nop, 0, 0)
/* PtrTypeBase */
INST(PtrType, Ptr, 1, 0)
+ INST(RefType, Ref, 1, 0)
/* OutTypeBase */
INST(OutType, Out, 1, 0)
INST(InOutType, InOut, 1, 0)
diff --git a/source/slang/ir-insts.h b/source/slang/ir-insts.h
index f35c391cf..880856b36 100644
--- a/source/slang/ir-insts.h
+++ b/source/slang/ir-insts.h
@@ -559,6 +559,7 @@ struct IRBuilder
IRPtrType* getPtrType(IRType* valueType);
IROutType* getOutType(IRType* valueType);
IRInOutType* getInOutType(IRType* valueType);
+ IRRefType* getRefType(IRType* valueType);
IRPtrTypeBase* getPtrType(IROp op, IRType* valueType);
IRArrayTypeBase* getArrayTypeBase(
diff --git a/source/slang/ir.cpp b/source/slang/ir.cpp
index 92801ec9a..2a8885b0e 100644
--- a/source/slang/ir.cpp
+++ b/source/slang/ir.cpp
@@ -1308,6 +1308,11 @@ namespace Slang
return (IRInOutType*) getPtrType(kIROp_InOutType, valueType);
}
+ IRRefType* IRBuilder::getRefType(IRType* valueType)
+ {
+ return (IRRefType*) getPtrType(kIROp_RefType, valueType);
+ }
+
IRPtrTypeBase* IRBuilder::getPtrType(IROp op, IRType* valueType)
{
IRInst* operands[] = { valueType };
diff --git a/source/slang/ir.h b/source/slang/ir.h
index 91ca377f2..b23e26e5e 100644
--- a/source/slang/ir.h
+++ b/source/slang/ir.h
@@ -828,6 +828,7 @@ struct IRPtrType : IRPtrTypeBase
SIMPLE_IR_PARENT_TYPE(OutTypeBase, PtrTypeBase)
SIMPLE_IR_TYPE(OutType, OutTypeBase)
SIMPLE_IR_TYPE(InOutType, OutTypeBase)
+SIMPLE_IR_TYPE(RefType, OutTypeBase)
struct IRFuncType : IRType
{
diff --git a/source/slang/lower-to-ir.cpp b/source/slang/lower-to-ir.cpp
index 81520abf5..96b28a15b 100644
--- a/source/slang/lower-to-ir.cpp
+++ b/source/slang/lower-to-ir.cpp
@@ -922,6 +922,11 @@ void assign(
LoweredValInfo const& left,
LoweredValInfo const& right);
+IRInst* getAddress(
+ IRGenContext* context,
+ LoweredValInfo const& inVal,
+ SourceLoc diagnosticLocation);
+
void lowerStmt(
IRGenContext* context,
Stmt* stmt);
@@ -1668,7 +1673,24 @@ struct ExprLoweringVisitorBase : ExprVisitor<Derived, LoweredValInfo>
// make a conscious decision at some point.
}
- if (paramDecl->HasModifier<OutModifier>()
+ if(paramDecl->HasModifier<RefModifier>())
+ {
+ // A `ref` qualified parameter must be implemented with by-reference
+ // parameter passing, so the argument value should be lowered as
+ // an l-value.
+ //
+ LoweredValInfo loweredArg = lowerLValueExpr(context, argExpr);
+
+ // According to our "calling convention" we need to
+ // pass a pointer into the callee. Unlike the case for
+ // `out` and `inout` below, it is never valid to do
+ // copy-in/copy-out for a `ref` parameter, so we just
+ // pass in the actual pointer.
+ //
+ IRInst* argPtr = getAddress(context, loweredArg, argExpr->loc);
+ (*ioArgs).Add(argPtr);
+ }
+ else if (paramDecl->HasModifier<OutModifier>()
|| paramDecl->HasModifier<InOutModifier>())
{
// This is a `out` or `inout` parameter, and so
@@ -2930,6 +2952,26 @@ static LoweredValInfo maybeMoveMutableTemp(
}
}
+IRInst* getAddress(
+ IRGenContext* context,
+ LoweredValInfo const& inVal,
+ SourceLoc diagnosticLocation)
+{
+ LoweredValInfo val = inVal;
+ switch(val.flavor)
+ {
+ case LoweredValInfo::Flavor::Ptr:
+ return val.val;
+
+ // TODO: are there other cases we need to handle here (e.g.,
+ // turning a bound subscript/property into an address)
+
+ default:
+ context->getSink()->diagnose(diagnosticLocation, Diagnostics::invalidLValueForRefParameter);
+ return nullptr;
+ }
+}
+
void assign(
IRGenContext* context,
LoweredValInfo const& inLeft,
@@ -3831,9 +3873,10 @@ struct DeclLoweringVisitor : DeclVisitor<DeclLoweringVisitor, LoweredValInfo>
//
enum ParameterDirection
{
- kParameterDirection_In,
- kParameterDirection_Out,
- kParameterDirection_InOut,
+ kParameterDirection_In, ///< Copy in
+ kParameterDirection_Out, ///< Copy out
+ kParameterDirection_InOut, ///< Copy in, copy out
+ kParameterDirection_Ref, ///< By-reference
};
struct ParameterInfo
{
@@ -3856,6 +3899,11 @@ struct DeclLoweringVisitor : DeclVisitor<DeclLoweringVisitor, LoweredValInfo>
//
ParameterDirection getParameterDirection(VarDeclBase* paramDecl)
{
+ if( paramDecl->HasModifier<RefModifier>() )
+ {
+ // The AST specified `ref`:
+ return kParameterDirection_Ref;
+ }
if( paramDecl->HasModifier<InOutModifier>() )
{
// The AST specified `inout`:
@@ -4350,6 +4398,9 @@ struct DeclLoweringVisitor : DeclVisitor<DeclLoweringVisitor, LoweredValInfo>
case kParameterDirection_InOut:
irParamType = subBuilder->getInOutType(irParamType);
break;
+ case kParameterDirection_Ref:
+ irParamType = subBuilder->getRefType(irParamType);
+ break;
default:
SLANG_UNEXPECTED("unknown parameter direction");
diff --git a/source/slang/modifier-defs.h b/source/slang/modifier-defs.h
index f9b3b6675..8ccdc75b1 100644
--- a/source/slang/modifier-defs.h
+++ b/source/slang/modifier-defs.h
@@ -71,8 +71,12 @@ SYNTAX_CLASS(RequiredGLSLVersionModifier, Modifier)
FIELD(Token, versionNumberToken)
END_SYNTAX_CLASS()
+
SIMPLE_SYNTAX_CLASS(InOutModifier, OutModifier)
+// `__ref` modifier for by-reference parameter passing
+SIMPLE_SYNTAX_CLASS(RefModifier, Modifier)
+
// This is a special sentinel modifier that gets added
// to the list when we have multiple variable declarations
// all sharing the same modifiers:
diff --git a/source/slang/parser.cpp b/source/slang/parser.cpp
index ab95be5ac..ad4eef9a6 100644
--- a/source/slang/parser.cpp
+++ b/source/slang/parser.cpp
@@ -4399,6 +4399,7 @@ namespace Slang
MODIFIER(input, InputModifier);
MODIFIER(out, OutModifier);
MODIFIER(inout, InOutModifier);
+ MODIFIER(__ref, RefModifier);
MODIFIER(const, ConstModifier);
MODIFIER(instance, InstanceModifier);
MODIFIER(__builtin, BuiltinModifier);
diff --git a/source/slang/syntax.cpp b/source/slang/syntax.cpp
index 5e855de29..74c817b92 100644
--- a/source/slang/syntax.cpp
+++ b/source/slang/syntax.cpp
@@ -303,6 +303,11 @@ void Type::accept(IValVisitor* visitor, void* extra)
return getPtrType(valueType, "InOutType").As<InOutType>();
}
+ RefPtr<RefType> Session::getRefType(RefPtr<Type> valueType)
+ {
+ return getPtrType(valueType, "RefType").As<RefType>();
+ }
+
RefPtr<PtrTypeBase> Session::getPtrType(RefPtr<Type> valueType, char const* ptrTypeName)
{
auto genericDecl = findMagicDecl(
@@ -2085,7 +2090,11 @@ void Type::accept(IValVisitor* visitor, void* extra)
{
auto paramDecl = paramDeclRef.getDecl();
auto paramType = GetType(paramDeclRef);
- if( paramDecl->FindModifier<OutModifier>() )
+ if( paramDecl->FindModifier<RefModifier>() )
+ {
+ paramType = session->getRefType(paramType);
+ }
+ else if( paramDecl->FindModifier<OutModifier>() )
{
if(paramDecl->FindModifier<InOutModifier>() || paramDecl->FindModifier<InModifier>())
{
diff --git a/source/slang/type-defs.h b/source/slang/type-defs.h
index 14e9c0066..c7b0004e6 100644
--- a/source/slang/type-defs.h
+++ b/source/slang/type-defs.h
@@ -355,6 +355,10 @@ END_SYNTAX_CLASS()
SYNTAX_CLASS(InOutType, OutTypeBase)
END_SYNTAX_CLASS()
+// The type for an `ref` parameter, e.g., `ref T`
+SYNTAX_CLASS(RefType, PtrTypeBase)
+END_SYNTAX_CLASS()
+
// A type alias of some kind (e.g., via `typedef`)
SYNTAX_CLASS(NamedExpressionType, Type)
DECL_FIELD(DeclRef<TypeDefDecl>, declRef)
generated by cgit v1.2.3 (git 2.39.1) at 2026-06-01 16:04:47 +0000