Changeset 248994 in webkit

Timestamp:

Aug 21, 2019 7:55:32 PM (5 years ago)

Author:

sbarati@apple.com

Message:

[WHLSL] Improve default constructor and emit fewer pointers in metal codegen
​https://bugs.webkit.org/show_bug.cgi?id=200995

Reviewed by Myles C. Maxfield.

This patch makes it so that we:

1. Emit less code for copy constructors by omitting an unused variable.
2. Emit ternary expressions instead of if statements for conditional assignments.
3. Don't copy pointers for producing an lvalue from DereferenceExpression.
4. Lazily produce lvalues for GlobalVariableReference.

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

(WebCore::WHLSL::Metal::FunctionDefinitionWriter::visit):

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

(WebCore::WHLSL::Metal::inlineNativeFunction):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/webgpu/WHLSL/Metal/WHLSLFunctionWriter.cpp (modified) (4 diffs)
• Modules/webgpu/WHLSL/Metal/WHLSLNativeFunctionWriter.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-21  Saam Barati  <sbarati@apple.com>
+
+        [WHLSL] Improve default constructor and emit fewer pointers in metal codegen
+        https://bugs.webkit.org/show_bug.cgi?id=200995
+
+        Reviewed by Myles C. Maxfield.
+
+        This patch makes it so that we:
+        1. Emit less code for copy constructors by omitting an unused variable.
+        2. Emit ternary expressions instead of if statements for conditional assignments.
+        3. Don't copy pointers for producing an lvalue from DereferenceExpression.
+        4. Lazily produce lvalues for GlobalVariableReference.
+
+        * Modules/webgpu/WHLSL/Metal/WHLSLFunctionWriter.cpp:
+        (WebCore::WHLSL::Metal::FunctionDefinitionWriter::visit):
+        * Modules/webgpu/WHLSL/Metal/WHLSLNativeFunctionWriter.cpp:
+        (WebCore::WHLSL::Metal::inlineNativeFunction):
+
 2019-08-21  Myles C. Maxfield  <mmaxfield@apple.com>
 

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

@@ -536 +536 @@
         m_indent, mangledTypeName, ' ', valueName, " = ", structVariable, "->", mangledFieldName, ";\n");
 
-    Indentation<4> indent = m_indent;
     appendLeftValue(globalVariableReference, valueName, { }, Nullability::NotNull,
-        [this, mangledTypeName, structVariable, mangledFieldName, indent] {
+        [this, mangledTypeName, structVariable, mangledFieldName] {
             auto pointerName = generateNextVariableName();
             m_stringBuilder.append(
-                indent, "thread ", mangledTypeName, "* ", pointerName, " = &", structVariable, "->", mangledFieldName, ";\n");
+                m_indent, "thread ", mangledTypeName, "* ", pointerName, " = &", structVariable, "->", mangledFieldName, ";\n");
             return pointerName;
         });
@@ -650 +649 @@
     auto [inputPointer, nullability] = takeLastValueAndNullability();
     auto resultValue = generateNextVariableName();
-    auto resultPointer = generateNextVariableName();
-
-    m_stringBuilder.append(
-        m_indent, m_typeNamer.mangledNameForType(dereferenceExpression.pointer().resolvedType()), ' ', resultPointer, " = ", inputPointer, ";\n",
-        m_indent, m_typeNamer.mangledNameForType(dereferenceExpression.resolvedType()), ' ', resultValue, ";\n");
+    auto resultType = m_typeNamer.mangledNameForType(dereferenceExpression.resolvedType());
+
     if (nullability == Nullability::CanBeNull) {
         m_stringBuilder.append(
-            m_indent, "if (", resultPointer, ")\n",
-            m_indent, "    ", resultValue, " = *", resultPointer, ";\n",
-            m_indent, "else\n",
-            m_indent, "    ", resultValue, " = { };\n"
-        );
+            m_indent, resultType , ' ', resultValue, " = ", inputPointer, " ? ", '*', inputPointer, " : ", resultType, "{ };\n");
     } else
         m_stringBuilder.append(m_indent, resultValue, " = *", inputPointer, ";\n");
-    appendLeftValue(dereferenceExpression, resultValue, resultPointer, nullability);
+
+    appendLeftValue(dereferenceExpression, resultValue, inputPointer, nullability);
 }
 
@@ -712 +705 @@
         auto ptrValue = takeLastValue();
         m_stringBuilder.append(
-            m_indent, mangledTypeName, ' ', variableName, ";\n",
-            m_indent, "if (", ptrValue, ")\n",
-            m_indent, "    ", variableName, " = { ", ptrValue, ", 1};\n",
-            m_indent, "else\n",
-            m_indent, "    ", variableName, " = { nullptr, 0 };\n"
-        );
+            m_indent, mangledTypeName, ' ', variableName, " = ", ptrValue, " ? ", mangledTypeName, "{ ", ptrValue, ", 1 } : ", mangledTypeName, "{ nullptr, 0 };\n");
     } else if (is<AST::ArrayType>(makeArrayReferenceExpression.leftValue().resolvedType())) {
         auto lValue = takeLastLeftValue().value;
@@ -766 +754 @@
     MangledVariableName variableName = iterator->value;
 
-    Indentation<4> indent = m_indent;
     appendLeftValue(variableReference, variableName, { }, Nullability::NotNull,
-        [this, &variableReference, variableName, indent] {
+        [this, &variableReference, variableName] {
             auto pointerName = generateNextVariableName();
-            m_stringBuilder.append(indent, "thread ", m_typeNamer.mangledNameForType(variableReference.resolvedType()), "* ", pointerName, " = &", variableName, ";\n");
+            m_stringBuilder.append(m_indent, "thread ", m_typeNamer.mangledNameForType(variableReference.resolvedType()), "* ", pointerName, " = &", variableName, ";\n");
             return pointerName;
         });

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

@@ -147 +147 @@
             auto& parameterType = *nativeFunctionDeclaration.parameters()[0]->type();
             auto metalParameterTypeName = typeNamer.mangledNameForType(parameterType);
-            auto variableName = generateNextVariableName();
-
-            stringBuilder.append(indent, metalParameterTypeName, ' ', variableName, " = ", args[0], ";\n");
 
             auto isEnumerationDefinition = [] (auto& type) {
@@ -156 +153 @@
             auto& unifiedReturnType = returnType.unifyNode();
             if (isEnumerationDefinition(unifiedReturnType) && !isEnumerationDefinition(parameterType.unifyNode())) {
+                auto variableName = generateNextVariableName();
+                stringBuilder.append(indent, metalParameterTypeName, ' ', variableName, " = ", args[0], ";\n");
                 auto& enumerationDefinition = downcast<AST::EnumerationDefinition>(downcast<AST::NamedType>(unifiedReturnType));
                 stringBuilder.append(indent, "switch (", variableName, ") {\n");
@@ -174 +173 @@
                         indent, "}\n");
                 }
-            }
-
-            stringBuilder.append(indent, returnName, " = static_cast<", metalReturnTypeName, ">(", variableName, ");\n");
+                stringBuilder.append(indent, returnName, " = static_cast<", metalReturnTypeName, ">(", variableName, ");\n");
+            } else
+                stringBuilder.append(indent, returnName, " = static_cast<", metalReturnTypeName, ">(", args[0], ");\n");
+
             return;
         }