From 430b832a292785a79ca4c25f037c658db8bdc2d2 Mon Sep 17 00:00:00 2001
From: Yong He <yonghe@outlook.com>
Date: Wed, 9 Jun 2021 07:34:52 -0700
Subject: Fix CUDA vector layout logic. (#1879)

And rename debug symbols for navis.

Co-authored-by: Yong He <yhe@nvidia.com>
---
 source/slang/slang-ir.cpp          | 10 +++++-----
 source/slang/slang-type-layout.cpp | 15 ++++-----------
 source/slang/slang.natvis          | 22 +++++++++++-----------
 3 files changed, 20 insertions(+), 27 deletions(-)

(limited to 'source')

diff --git a/source/slang/slang-ir.cpp b/source/slang/slang-ir.cpp
index 90d0181f7..fe60fb480 100644
--- a/source/slang/slang-ir.cpp
+++ b/source/slang/slang-ir.cpp
@@ -6023,11 +6023,11 @@ namespace Slang
 #ifdef _DEBUG
 // Natvis sometimes cannot find enum values.
 // Export symbols for them to make sure natvis works correctly when debugging external projects.
-SLANG_API const int __SlangIROpNameHint = Slang::kIROp_NameHintDecoration;
-SLANG_API const int __SlangIROpExport = Slang::kIROp_ExportDecoration;
-SLANG_API const int __SlangIROpImport = Slang::kIROp_ImportDecoration;
-SLANG_API const int __SlangIROpStringLit = Slang::kIROp_StringLit;
-SLANG_API const int __SlangIROpIntLit = Slang::kIROp_IntLit;
+SLANG_API const int SlangDebug__IROpNameHint = Slang::kIROp_NameHintDecoration;
+SLANG_API const int SlangDebug__IROpExport = Slang::kIROp_ExportDecoration;
+SLANG_API const int SlangDebug__IROpImport = Slang::kIROp_ImportDecoration;
+SLANG_API const int SlangDebug__IROpStringLit = Slang::kIROp_StringLit;
+SLANG_API const int SlangDebug__IROpIntLit = Slang::kIROp_IntLit;
 #endif
 #endif
 
diff --git a/source/slang/slang-type-layout.cpp b/source/slang/slang-type-layout.cpp
index 02b5b5bdc..ad38e11cb 100644
--- a/source/slang/slang-type-layout.cpp
+++ b/source/slang/slang-type-layout.cpp
@@ -465,16 +465,10 @@ struct CUDALayoutRulesImpl : DefaultLayoutRulesImpl
         return arrayInfo;
     }
 
-    // Given `size` between [0, 16] return the smallest power-of-2 that is greater than or equal to `size`.
-    uint32_t getVectorAlignment(uint32_t size)
+    // Computes the alignment of a vector type given element size and element count.
+    uint32_t getVectorAlignment(uint32_t elementSize, uint32_t elementCount)
     {
-        SLANG_ASSERT(size <= 16);
-        --size;
-        // Set every bit after the highest bit.
-        size |= (size >> 1);
-        size |= (size >> 2);
-        ++size;
-        return size;
+        return elementCount == 3 ? elementSize : elementSize * elementCount;
     }
 
     SimpleLayoutInfo GetVectorLayout(BaseType elementType, SimpleLayoutInfo elementInfo, size_t elementCount) override
@@ -491,8 +485,7 @@ struct CUDALayoutRulesImpl : DefaultLayoutRulesImpl
         SimpleLayoutInfo vectorInfo;
         vectorInfo.kind = elementInfo.kind;
         vectorInfo.size = elementInfo.size * elementCount;
-        vectorInfo.alignment = getVectorAlignment(
-            (uint32_t)(elementInfo.size.getFiniteValue() * elementCount));
+        vectorInfo.alignment = getVectorAlignment((uint32_t)elementInfo.size.getFiniteValue(), (uint32_t)elementCount);
         return vectorInfo;
     }
 
diff --git a/source/slang/slang.natvis b/source/slang/slang.natvis
index 5af533715..3e742ffb5 100644
--- a/source/slang/slang.natvis
+++ b/source/slang/slang.natvis
@@ -83,20 +83,20 @@
 			  <If Condition="child == 0">
 				  <Break/>
 			  </If>
-			  <If Condition="child->m_op == __SlangIROpNameHint">
+			  <If Condition="child->m_op == SlangDebug__IROpNameHint">
 				  <Item Name="[name]">((Slang::IRStringLit*)(((Slang::IRUse*)(child + 1))->usedValue))->value.stringVal.chars,[((Slang::IRStringLit*)(((Slang::IRUse*)(child + 1))->usedValue))->value.stringVal.numChars]s8</Item>
 			  </If>
-			  <If Condition="child->m_op == __SlangIROpExport">
+			  <If Condition="child->m_op == SlangDebug__IROpExport">
 				  <Item Name="[exportName]">((Slang::IRStringLit*)(((Slang::IRUse*)(child + 1))->usedValue))->value.stringVal.chars,[((Slang::IRStringLit*)(((Slang::IRUse*)(child + 1))->usedValue))->value.stringVal.numChars]s8</Item>
 			  </If>
-			  <If Condition="child->m_op == __SlangIROpImport">
+			  <If Condition="child->m_op == SlangDebug__IROpImport">
 				  <Item Name="[importName]">((Slang::IRStringLit*)(((Slang::IRUse*)(child + 1))->usedValue))->value.stringVal.chars,[((Slang::IRStringLit*)(((Slang::IRUse*)(child + 1))->usedValue))->value.stringVal.numChars]s8</Item>
 			  </If>
 			  <Exec>child = child->next</Exec>
 		  </Loop>
       </CustomListItems>
-      <Item Name="[value]" Condition="m_op == __SlangIROpStringLit">((IRStringLit*)this)->value.stringVal.chars,[((IRStringLit*)this)->value.stringVal.numChars]s8</Item>
-      <Item Name="[value]" Condition="m_op == __SlangIROpIntLit">((IRIntLit*)this)->value.intVal</Item>
+      <Item Name="[value]" Condition="m_op == SlangDebug__IROpStringLit">((IRStringLit*)this)->value.stringVal.chars,[((IRStringLit*)this)->value.stringVal.numChars]s8</Item>
+      <Item Name="[value]" Condition="m_op == SlangDebug__IROpIntLit">((IRIntLit*)this)->value.intVal</Item>
 	  <!--
       <Synthetic Name="[operands]">
         <DisplayString>{{count = {operandCount}}}</DisplayString>
@@ -121,14 +121,14 @@
 			<Exec>child = pOperandInst->m_decorationsAndChildren.first</Exec>
 		    <Exec>nameDecoration = 0</Exec>
 		    <Loop Condition="child != 0">
-			    <If Condition="child->m_op == __SlangIROpNameHint">
+			    <If Condition="child->m_op == SlangDebug__IROpNameHint">
 				    <Exec>nameDecoration = child</Exec>
 				    <Break/>
 			    </If>
-			    <If Condition="child->m_op == __SlangIROpExport &amp;&amp; (nameDecoration == 0 || nameDecoration->m_op != __SlangIROpNameHint)">
+			    <If Condition="child->m_op == SlangDebug__IROpExport &amp;&amp; (nameDecoration == 0 || nameDecoration->m_op != SlangDebug__IROpNameHint)">
 				    <Exec>nameDecoration = child</Exec>
 			    </If>
-			    <If Condition="child->m_op == __SlangIROpImport &amp;&amp; (nameDecoration == 0 || nameDecoration->m_op != __SlangIROpNameHint)">
+			    <If Condition="child->m_op == SlangDebug__IROpImport &amp;&amp; (nameDecoration == 0 || nameDecoration->m_op != SlangDebug__IROpNameHint)">
 				    <Exec>nameDecoration = child</Exec>
 			    </If>
 			    <Exec>child = child->next</Exec>
@@ -150,14 +150,14 @@
 				  <Exec>child = pItem->m_decorationsAndChildren.first </Exec>
 			      <Exec>nameDecoration = 0</Exec>
 				  <Loop Condition="child != 0">
-				      <If Condition="child->m_op == __SlangIROpNameHint">
+				      <If Condition="child->m_op == SlangDebug__IROpNameHint">
 						  <Exec>nameDecoration = child</Exec>
 						  <Break/>
 				      </If>
-				      <If Condition="child->m_op == __SlangIROpExport &amp;&amp; (nameDecoration == 0 || nameDecoration->m_op != __SlangIROpNameHint)">
+				      <If Condition="child->m_op == SlangDebug__IROpExport &amp;&amp; (nameDecoration == 0 || nameDecoration->m_op != SlangDebug__IROpNameHint)">
 						  <Exec>nameDecoration = child</Exec>
 				      </If>
-					  <If Condition="child->m_op == __SlangIROpImport &amp;&amp; (nameDecoration == 0 || nameDecoration->m_op != __SlangIROpNameHint)">
+					  <If Condition="child->m_op == SlangDebug__IROpImport &amp;&amp; (nameDecoration == 0 || nameDecoration->m_op != SlangDebug__IROpNameHint)">
 						  <Exec>nameDecoration = child</Exec>
 					  </If>
 				      <Exec>child = child->next</Exec>
-- 
cgit v1.2.3