Changeset 249214 in webkit

Timestamp:

Aug 28, 2019 12:46:36 PM (5 years ago)

Author:

mmaxfield@apple.com

Message:

[WHLSL] Matrices need to have correct alignment
​https://bugs.webkit.org/show_bug.cgi?id=201212

Reviewed by Robin Morisset.

Source/WebCore:

Matrices have particular alignment requirements and size requirements.

Type | Alignment | Size

---

float2x2 | 8 | 16
float2x3 | 16 | 32
float2x4 | 16 | 32
float3x2 | 8 | 24
float3x3 | 16 | 48
float3x4 | 16 | 48
float4x2 | 8 | 32
float4x3 | 16 | 64
float4x4 | 16 | 64

These are important because they may be a member of a struct, and we don't want to misplace
every successive item in the struct.

Test: webgpu/whlsl/matrix-alignment.html

• Modules/webgpu/WHLSL/Metal/WHLSLNativeTypeWriter.cpp:

(WebCore::WHLSL::Metal::writeNativeType):

LayoutTests:

Test the alignment and size of float matrices.

Intentionally don't test bool matrices, because they can't be placed in buffers,
meaning their size and alignment is unobservable.

• webgpu/whlsl/matrix-alignment-expected.txt: Added.
• webgpu/whlsl/matrix-alignment.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/webgpu/whlsl/matrix-alignment-expected.txt (added)
• LayoutTests/webgpu/whlsl/matrix-alignment.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/webgpu/WHLSL/Metal/WHLSLNativeTypeWriter.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-08-28  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        [WHLSL] Matrices need to have correct alignment
+        https://bugs.webkit.org/show_bug.cgi?id=201212
+
+        Reviewed by Robin Morisset.
+
+        Test the alignment and size of float matrices.
+
+        Intentionally don't test bool matrices, because they can't be placed in buffers,
+        meaning their size and alignment is unobservable.
+
+        * webgpu/whlsl/matrix-alignment-expected.txt: Added.
+        * webgpu/whlsl/matrix-alignment.html: Added.
+
 2019-08-28  Rob Buis  <rbuis@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-28  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        [WHLSL] Matrices need to have correct alignment
+        https://bugs.webkit.org/show_bug.cgi?id=201212
+
+        Reviewed by Robin Morisset.
+
+        Matrices have particular alignment requirements and size requirements.
+
+          Type   | Alignment | Size
+        ---------------------------
+        float2x2 |         8 |   16
+        float2x3 |        16 |   32
+        float2x4 |        16 |   32
+        float3x2 |         8 |   24
+        float3x3 |        16 |   48
+        float3x4 |        16 |   48
+        float4x2 |         8 |   32
+        float4x3 |        16 |   64
+        float4x4 |        16 |   64
+
+        These are important because they may be a member of a struct, and we don't want to misplace
+        every successive item in the struct.
+
+        Test: webgpu/whlsl/matrix-alignment.html
+
+        * Modules/webgpu/WHLSL/Metal/WHLSLNativeTypeWriter.cpp:
+        (WebCore::WHLSL::Metal::writeNativeType):
+
 2019-08-28  Rob Buis  <rbuis@igalia.com>
 

trunk/Source/WebCore/Modules/webgpu/WHLSL/Metal/WHLSLNativeTypeWriter.cpp

@@ -38 +38 @@
 
 namespace Metal {
+
+enum class MatrixType : uint8_t {
+    Float,
+    Bool
+};
 
 String writeNativeType(AST::NativeTypeDeclaration& nativeTypeDeclaration)
@@ -97 +102 @@
         auto& namedType = downcast<AST::NamedType>(unifyNode);
         auto& parameterType = downcast<AST::NativeTypeDeclaration>(namedType);
-        auto prefix = ([&]() -> String {
+        auto matrixType = ([&]() -> MatrixType {
             if (parameterType.name() == "bool")
-                return "bool";
+                return MatrixType::Bool;
             ASSERT(parameterType.name() == "float");
-            return "float";
+            return MatrixType::Float;
         })();
 
@@ -115 +120 @@
         unsigned columns = integerLiteral2.value();
         ASSERT(columns == 2 || columns == 3 || columns == 4);
-        return makeString("array<", prefix, ", ", columns * rows, ">");
+
+        switch (matrixType) {
+        case MatrixType::Float: {
+            unsigned alignment = columns == 2 ? 8 : 16;
+            if (columns == 3)
+                columns = 4;
+            return makeString("array<float, ", columns * rows, "> __attribute__((aligned(", alignment, ")))");
+        }
+        case MatrixType::Bool:
+            return makeString("array<bool, ", columns * rows, ">");
+        }
     }
     ASSERT(nativeTypeDeclaration.typeArguments().size() == 1);