From 06a0e3980fd04fa265bd20eb11f2abc18bd6a215 Mon Sep 17 00:00:00 2001
From: jsmall-nvidia <jsmall@nvidia.com>
Date: Thu, 22 Aug 2019 15:58:28 -0400
Subject: WIP: CPU compute coverage (#1030)

* Add support for '=' when defining a name in test.

* Add support for  double intrinsics.

* Add support for asdouble
Add findOrAddInst - used instead of findOrEmitHoistableInst, for nominal instructions.
Support cloning of string literals.
C++ working on more compute tests.

* Constant buffer support in reflection.
Fixed debugging into source for generated C++.
buffer-layout.slang works.

* Added cpu test result.

* Remove some commented out code.
Comment on next fixes.

* Improvements to reflection CPU code.

* C++ working with ByteAddressBuffer.

* Enabled more compute tests for CPU.

* Enabled more compute tests on CPU.
Added support for [] style access to a vector.

* Enabled more CPU compute tests.

* Handling of buffer-type-splitting.slang
Named buffers can be paths to resources

* Fix some warnings, remove some dead code.

* Fix problem with verification of number of operands for asuint/asint as they can have 1 or 3 operands. asdouble takes 2.

* Fix handling in MemoryArena around aligned allocations. That _allocateAlignedFromNewBlock assumed the block allocated has the aligment that was requested and so did not correct the start address.
---
 tools/render-test/shader-input-layout.cpp | 45 +++++++++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 2 deletions(-)

(limited to 'tools/render-test/shader-input-layout.cpp')

diff --git a/tools/render-test/shader-input-layout.cpp b/tools/render-test/shader-input-layout.cpp
index e555ee6ca..a59f30a24 100644
--- a/tools/render-test/shader-input-layout.cpp
+++ b/tools/render-test/shader-input-layout.cpp
@@ -286,13 +286,54 @@ namespace renderer_test
                                 else if (parser.LookAhead("name"))
                                 {
                                     parser.ReadToken();
-                                    Token nameToken = parser.ReadToken();
 
+                                    // Optionally consume '=' 
+                                    if (parser.NextToken().Type == TokenType::OpAssign)
+                                    {
+                                        parser.ReadToken();
+                                    }
+
+                                    StringBuilder builder;
+
+                                    Token nameToken = parser.ReadToken();
                                     if (nameToken.Type != TokenType::Identifier)
                                     {
                                         throw TextFormatException("Invalid input syntax at line " + parser.NextToken().Position.Line);
                                     }
-                                    entry.name = nameToken.Content;
+                                    builder << nameToken.Content;
+
+                                    while (!parser.IsEnd())
+                                    {
+                                        Token token = parser.NextToken(0);
+
+                                        if (token.Type == TokenType::LBracket)
+                                        {
+                                            parser.ReadToken();
+                                            int index = parser.ReadInt();
+                                            SLANG_ASSERT(index >= 0);
+                                            parser.ReadMatchingToken(TokenType::RBracket);
+
+                                            builder << "[" << index << "]";
+                                        }
+                                        else if (token.Type == TokenType::Dot)
+                                        {
+                                            parser.ReadToken();
+                                            Token identifierToken = parser.ReadMatchingToken(TokenType::Identifier);
+
+                                            builder << "." << identifierToken.Content; 
+                                        }
+                                        else if (token.Type == TokenType::Comma)
+                                        {
+                                            // Break out
+                                            break;
+                                        }
+                                        else
+                                        {
+                                            throw TextFormatException("Invalid input syntax at line " + parser.NextToken().Position.Line);
+                                        }
+                                    }
+
+                                    entry.name = builder;
                                 }
 
                                 if (parser.LookAhead(","))
-- 
cgit v1.2.3