From dd662f5cda97e7a6720ef526509a772a06112d4a Mon Sep 17 00:00:00 2001
From: jsmall-nvidia <jsmall@nvidia.com>
Date: Mon, 5 Apr 2021 12:51:52 -0400
Subject: Added tests/current-bugs (#1781)

* #include an absolute path didn't work - because paths were taken to always be relative.

* Added a current-bugs folder in tests for active (ie with issue) bug tests demonstrating the problem.

Co-authored-by: Tim Foley <tfoleyNV@users.noreply.github.com>
---
 tests/current-bugs/paste-non-expansion.slang       | 16 ++++++++++++
 .../paste-non-expansion.slang.expected             |  6 +++++
 tests/current-bugs/resource-struct-out.slang       | 30 ++++++++++++++++++++++
 tests/current-bugs/resource-struct-return.slang    | 28 ++++++++++++++++++++
 tests/preprocessor/paste-non-expansion.slang       | 16 ------------
 .../paste-non-expansion.slang.expected             |  6 -----
 6 files changed, 80 insertions(+), 22 deletions(-)
 create mode 100644 tests/current-bugs/paste-non-expansion.slang
 create mode 100644 tests/current-bugs/paste-non-expansion.slang.expected
 create mode 100644 tests/current-bugs/resource-struct-out.slang
 create mode 100644 tests/current-bugs/resource-struct-return.slang
 delete mode 100644 tests/preprocessor/paste-non-expansion.slang
 delete mode 100644 tests/preprocessor/paste-non-expansion.slang.expected

diff --git a/tests/current-bugs/paste-non-expansion.slang b/tests/current-bugs/paste-non-expansion.slang
new file mode 100644
index 000000000..8270db676
--- /dev/null
+++ b/tests/current-bugs/paste-non-expansion.slang
@@ -0,0 +1,16 @@
+//DIAGNOSTIC_TEST:SIMPLE:-E
+
+// NOTE! This test should *fail*, if preprocessor is working correctly!
+
+// This demonstrates the existance of a bug in Slang preprocessor macro expansion. Could be due to incorrect paste handling
+// or perhaps the rules around parameter expansion.
+
+#define CONCAT2(x, y) x ## y
+#define CONCAT(x, y) CONCAT2(x, y)
+
+#define SOMETHING someThing
+
+// Should be someThingElse
+CONCAT(SOMETHING, Else)
+// Should be SOMETHINGAnother, but Slang expands to produce someThingAnother
+CONCAT2(SOMETHING, Another)
\ No newline at end of file
diff --git a/tests/current-bugs/paste-non-expansion.slang.expected b/tests/current-bugs/paste-non-expansion.slang.expected
new file mode 100644
index 000000000..2fbb7bad3
--- /dev/null
+++ b/tests/current-bugs/paste-non-expansion.slang.expected
@@ -0,0 +1,6 @@
+result code = 0
+standard error = {
+}
+standard output = {
+someThingElse someThingAnother 
+}
diff --git a/tests/current-bugs/resource-struct-out.slang b/tests/current-bugs/resource-struct-out.slang
new file mode 100644
index 000000000..d47b2ec7c
--- /dev/null
+++ b/tests/current-bugs/resource-struct-out.slang
@@ -0,0 +1,30 @@
+//DISABLE_TEST:SIMPLE:-target hlsl -entry computeMain -profile cs_6_2
+
+// This test demonstrates out parameter with a struct & resource type crashes 
+    
+RWTexture1D<float> g_t;
+
+RWStructuredBuffer<int> outputBuffer;
+
+struct Thing
+{
+    int a;
+    RWTexture1D<float> t;
+};
+
+void setThing(out Thing t)
+{
+    t.a = 10;
+    t.t = g_t;
+}
+
+[numthreads(4, 4, 1)]
+void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID)
+{
+    int x = dispatchThreadID.x;
+   
+    Thing thing;
+    setThing(thing);
+        
+    outputBuffer[dispatchThreadID.x] = x + thing.t.Load(1); 
+}
diff --git a/tests/current-bugs/resource-struct-return.slang b/tests/current-bugs/resource-struct-return.slang
new file mode 100644
index 000000000..8d0508097
--- /dev/null
+++ b/tests/current-bugs/resource-struct-return.slang
@@ -0,0 +1,28 @@
+//DISABLE_TEST:SIMPLE:-target hlsl -entry computeMain -profile cs_6_2
+
+// This test demonstrates returning struct with resource causes internal compiler error
+
+RWTexture1D<float> g_t;
+RWStructuredBuffer<int> outputBuffer;
+
+struct Thing
+{
+    int a;
+    RWTexture1D<float> t;
+};
+
+Thing makeThing()
+{
+ 	Thing t;
+    t.a = 10;
+    t.t = g_t;
+    return t;
+}
+
+[numthreads(4, 4, 1)]
+void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID)
+{
+    int x = dispatchThreadID.x;
+    Thing thing = makeThing();
+    outputBuffer[dispatchThreadID.x] = x + thing.t.Load(1); 
+}
\ No newline at end of file
diff --git a/tests/preprocessor/paste-non-expansion.slang b/tests/preprocessor/paste-non-expansion.slang
deleted file mode 100644
index 8270db676..000000000
--- a/tests/preprocessor/paste-non-expansion.slang
+++ /dev/null
@@ -1,16 +0,0 @@
-//DIAGNOSTIC_TEST:SIMPLE:-E
-
-// NOTE! This test should *fail*, if preprocessor is working correctly!
-
-// This demonstrates the existance of a bug in Slang preprocessor macro expansion. Could be due to incorrect paste handling
-// or perhaps the rules around parameter expansion.
-
-#define CONCAT2(x, y) x ## y
-#define CONCAT(x, y) CONCAT2(x, y)
-
-#define SOMETHING someThing
-
-// Should be someThingElse
-CONCAT(SOMETHING, Else)
-// Should be SOMETHINGAnother, but Slang expands to produce someThingAnother
-CONCAT2(SOMETHING, Another)
\ No newline at end of file
diff --git a/tests/preprocessor/paste-non-expansion.slang.expected b/tests/preprocessor/paste-non-expansion.slang.expected
deleted file mode 100644
index 2fbb7bad3..000000000
--- a/tests/preprocessor/paste-non-expansion.slang.expected
+++ /dev/null
@@ -1,6 +0,0 @@
-result code = 0
-standard error = {
-}
-standard output = {
-someThingElse someThingAnother 
-}
-- 
cgit v1.2.3