Merge remote-tracking branch 'origin/master' into struct-inheritance-and-interfaces

7 files changed, 106 insertions, 26 deletions

diff --git a/prelude/slang-cpp-prelude.h b/prelude/slang-cpp-prelude.h
index 7da613024..d47b0463c 100644
--- a/prelude/slang-cpp-prelude.h
+++ b/prelude/slang-cpp-prelude.h
@@ -3,7 +3,18 @@
 
 #include "../slang.h"
 
-#include <math.h>
+// Because the signiture of isnan, isfinite, and is isinf changed in C++, we use the macro
+// to use the version in the std namespace. 
+// https://stackoverflow.com/questions/39130040/cmath-hides-isnan-in-math-h-in-c14-c11
+ 
+#if SLANG_GCC_FAMILY && __GNUC__ < 6
+#   include <cmath>
+#   define SLANG_PRELUDE_STD std::
+#else
+#   include <math.h>
+#   define SLANG_PRELUDE_STD
+#endif
+
 #include <assert.h>
 #include <stdlib.h>
 
diff --git a/prelude/slang-cpp-scalar-intrinsics.h b/prelude/slang-cpp-scalar-intrinsics.h
index c814365c6..07945f1e0 100644
--- a/prelude/slang-cpp-scalar-intrinsics.h
+++ b/prelude/slang-cpp-scalar-intrinsics.h
@@ -68,9 +68,9 @@ SLANG_FORCE_INLINE float F32_rsqrt(float f) { return 1.0f / F32_sqrt(f); }
 SLANG_FORCE_INLINE float F32_sign(float f) { return ( f == 0.0f) ? f : (( f < 0.0f) ? -1.0f : 1.0f); } 
 SLANG_FORCE_INLINE float F32_frac(float f) { return f - F32_floor(f); }
 
-SLANG_FORCE_INLINE bool F32_isnan(float f) { return isnan(f); }
-SLANG_FORCE_INLINE bool F32_isfinite(float f) { return isfinite(f); }
-SLANG_FORCE_INLINE bool F32_isinf(float f) { return isinf(f); }
+SLANG_FORCE_INLINE bool F32_isnan(float f) { return SLANG_PRELUDE_STD isnan(f); }
+SLANG_FORCE_INLINE bool F32_isfinite(float f) { return SLANG_PRELUDE_STD isfinite(f); }
+SLANG_FORCE_INLINE bool F32_isinf(float f) { return SLANG_PRELUDE_STD isinf(f); }
 
 // Binary
 SLANG_FORCE_INLINE float F32_min(float a, float b) { return ::fminf(a, b); }
@@ -84,7 +84,7 @@ SLANG_FORCE_INLINE float F32_frexp(float x, float& e)
 {
     int ei;
     float m = ::frexpf(x, &ei);
-    e = ei;
+    e = float(ei);
     return m;
 }
 SLANG_FORCE_INLINE float F32_modf(float x, float& ip)
@@ -135,9 +135,9 @@ SLANG_FORCE_INLINE double F64_rsqrt(double f) { return 1.0 / F64_sqrt(f); }
 SLANG_FORCE_INLINE double F64_sign(double f) { return (f == 0.0) ? f : ((f < 0.0) ? -1.0 : 1.0); }
 SLANG_FORCE_INLINE double F64_frac(double f) { return f - F64_floor(f); }
 
-SLANG_FORCE_INLINE bool F64_isnan(double f) { return isnan(f); }
-SLANG_FORCE_INLINE bool F64_isfinite(double f) { return isfinite(f); }
-SLANG_FORCE_INLINE bool F64_isinf(double f) { return isinf(f); }
+SLANG_FORCE_INLINE bool F64_isnan(double f) { return SLANG_PRELUDE_STD isnan(f); }
+SLANG_FORCE_INLINE bool F64_isfinite(double f) { return SLANG_PRELUDE_STD isfinite(f); }
+SLANG_FORCE_INLINE bool F64_isinf(double f) { return SLANG_PRELUDE_STD isinf(f); }
 
 // Binary
 SLANG_FORCE_INLINE double F64_min(double a, double b) { return ::fmin(a, b); }
@@ -151,9 +151,10 @@ SLANG_FORCE_INLINE double F64_frexp(double x, double& e)
 {
     int ei;
     double m = ::frexp(x, &ei);
-    e = ei;
+    e = float(ei);
     return m;
 }
+
 SLANG_FORCE_INLINE double F64_modf(double x, double& ip)
 {
     return ::modf(x, &ip);
@@ -236,14 +237,17 @@ SLANG_FORCE_INLINE uint64_t U64_abs(uint64_t f) { return f; }
 SLANG_FORCE_INLINE uint64_t U64_min(uint64_t a, uint64_t b) { return a < b ? a : b; }
 SLANG_FORCE_INLINE uint64_t U64_max(uint64_t a, uint64_t b) { return a > b ? a : b; }
 
+// TODO(JS): We don't define countbits for 64bit in stdlib currently.
+// It's not clear from documentation if it should return 32 or 64 bits, if it exists. 
+// 32 bits can always hold the result, and will be implicitly promoted. 
 SLANG_FORCE_INLINE uint32_t U64_countbits(uint64_t v)
 {
 #if SLANG_GCC_FAMILY    
-    return __builtin_popcountl(v);
+    return uint32_t(__builtin_popcountl(v));
 #elif SLANG_PROCESSOR_X86_64 && SLANG_VC
-    return __popcnt64(v);
+    return uint32_t(__popcnt64(v));
 #else     
-    uint64_t c = 0;
+    uint32_t c = 0;
     while (v)
     {
         c++;
diff --git a/premake5.lua b/premake5.lua
index 93d310ee0..2b3385b1c 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -201,7 +201,7 @@ workspace "slang"
         architecture "ARM"
 
     filter { "toolset:clang or gcc*" }
-        buildoptions { "-Wno-unused-parameter", "-Wno-type-limits", "-Wno-sign-compare", "-Wno-unused-variable", "-Wno-reorder", "-Wno-switch", "-Wno-return-type", "-Wno-unused-local-typedefs", "-Wno-parentheses",  "-std=c++11", "-fvisibility=hidden" , "-Wno-ignored-optimization-argument", "-Wno-unknown-warning-option"} 
+        buildoptions { "-Wno-unused-parameter", "-Wno-type-limits", "-Wno-sign-compare", "-Wno-unused-variable", "-Wno-reorder", "-Wno-switch", "-Wno-return-type", "-Wno-unused-local-typedefs", "-Wno-parentheses",  "-std=c++11", "-fvisibility=hidden" , "-Wno-ignored-optimization-argument", "-Wno-unknown-warning-option", "-Wno-class-memaccess"} 
         
     filter { "toolset:gcc*"}
         buildoptions { "-Wno-unused-but-set-variable", "-Wno-implicit-fallthrough"  }
diff --git a/source/slang/slang-emit-c-like.cpp b/source/slang/slang-emit-c-like.cpp
index 6c004c84c..3438fd3f4 100644
--- a/source/slang/slang-emit-c-like.cpp
+++ b/source/slang/slang-emit-c-like.cpp
@@ -237,18 +237,15 @@ List<IRWitnessTableEntry*> CLikeSourceEmitter::getSortedWitnessTableEntries(IRWi
     for (UInt i = 0; i < interfaceType->getOperandCount(); i++)
     {
         auto reqKey = cast<IRStructKey>(interfaceType->getOperand(i));
-        bool matchingEntryFound = false;
         IRWitnessTableEntry* entry = nullptr;
         if (witnessTableEntryDictionary.TryGetValue(reqKey, entry))
         {
-            if (entry->requirementKey.get() == reqKey)
-            {
-                matchingEntryFound = true;
-                sortedWitnessTableEntries.add(entry);
-                break;
-            }
+            sortedWitnessTableEntries.add(entry);
+        }
+        else
+        {
+            SLANG_UNREACHABLE("interface requirement key not found in witness table.");
         }
-        SLANG_ASSERT(matchingEntryFound);
     }
     return sortedWitnessTableEntries;
 }
diff --git a/source/slang/slang-emit-cpp.cpp b/source/slang/slang-emit-cpp.cpp
index accb290fa..4a59f4cf9 100644
--- a/source/slang/slang-emit-cpp.cpp
+++ b/source/slang/slang-emit-cpp.cpp
@@ -1711,6 +1711,15 @@ void CPPSourceEmitter::_emitWitnessTableDefinitions()
                 m_writer->emit("&KernelContext::");
                 m_writer->emit(_getWitnessTableWrapperFuncName(funcVal));
             }
+            else if (auto witnessTableVal = as<IRWitnessTable>(entry->getSatisfyingVal()))
+            {
+                if (!isFirstEntry)
+                    m_writer->emit(",\n");
+                else
+                    isFirstEntry = false;
+                m_writer->emit("&");
+                m_writer->emit(getName(witnessTableVal));
+            }
             else
             {
                 // TODO: handle other witness table entry types.
@@ -1745,16 +1754,11 @@ void CPPSourceEmitter::_maybeEmitWitnessTableTypeDefinition(
     emitSimpleType(interfaceType);
     m_writer->emit("\n{\n");
     m_writer->indent();
-    bool isFirstEntry = true;
     for (Index i = 0; i < sortedWitnessTableEntries.getCount(); i++)
     {
         auto entry = sortedWitnessTableEntries[i];
         if (auto funcVal = as<IRFunc>(entry->satisfyingVal.get()))
         {
-            if (!isFirstEntry)
-                m_writer->emit(",\n");
-            else
-                isFirstEntry = false;
             emitType(funcVal->getResultType());
             m_writer->emit(" (KernelContext::*");
             m_writer->emit(getName(entry->requirementKey.get()));
@@ -1777,6 +1781,13 @@ void CPPSourceEmitter::_maybeEmitWitnessTableTypeDefinition(
             }
             m_writer->emit(");\n");
         }
+        else if (auto witnessTableVal = as<IRWitnessTable>(entry->getSatisfyingVal()))
+        {
+            emitType(as<IRType>(witnessTableVal->getOperand(0)));
+            m_writer->emit("* ");
+            m_writer->emit(getName(entry->requirementKey.get()));
+            m_writer->emit(";\n");
+        }
         else
         {
             // TODO: handle other witness table entry types.
diff --git a/tests/compute/dynamic-dispatch-2.slang b/tests/compute/dynamic-dispatch-2.slang
new file mode 100644
index 000000000..ade8aeb84
--- /dev/null
+++ b/tests/compute/dynamic-dispatch-2.slang
@@ -0,0 +1,53 @@
+//TEST(compute):COMPARE_COMPUTE:-cpu -xslang -allow-dynamic-code
+
+// Test dynamic dispatch code gen for static member functions
+// of associated type.
+
+interface IAssoc
+{
+    int get();
+    static int getBase();
+}
+interface IInterface
+{
+    associatedtype Assoc : IAssoc;
+	int Compute(int inVal);
+    Assoc getAssoc();
+};
+
+int GenericCompute<T:IInterface>(T obj, int inVal)
+{
+	return obj.Compute(inVal) + T.Assoc.getBase();
+}
+
+struct Impl : IInterface
+{
+    struct Assoc : IAssoc
+    {
+        int val;
+        int get() { return val; }
+        static int getBase() { return -1; }
+    };
+    int base;
+	int Compute(int inVal) { return base + inVal * inVal; }
+    Assoc getAssoc() { Assoc rs; rs.val = 1; return rs; }
+};
+
+int test(int inVal)
+{
+    Impl obj;
+    obj.base = 1;
+	return GenericCompute<Impl>(obj, inVal);
+}
+
+//TEST_INPUT:ubuffer(data=[0 1 2 3], stride=4):out,name=outputBuffer
+RWStructuredBuffer<int> outputBuffer : register(u0);
+
+[numthreads(4, 1, 1)]
+void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID)
+{
+	uint tid = dispatchThreadID.x;
+	int inVal = outputBuffer[tid];
+	int outVal = test(inVal);
+	outputBuffer[tid] = outVal;
+}
diff --git a/tests/compute/dynamic-dispatch-2.slang.expected.txt b/tests/compute/dynamic-dispatch-2.slang.expected.txt
new file mode 100644
index 000000000..c9fa0697e
--- /dev/null
+++ b/tests/compute/dynamic-dispatch-2.slang.expected.txt
@@ -0,0 +1,4 @@
+0
+1
+4
+9