Hash :
c55aefe3
Author :
Date :
2018-08-28T19:59:00
ES31: Support atomic functions on D3D11 - Part III This patch is the third one to support atomic functions on D3D11. In this patch we enable support for atomic function returns outside of assignments (e.g. part of arithmetic operations or to index into arrays) and when used directly initialize a variable. Note that we are still missing the functionality to be tag loops with [allow_uav_condition] as required by InterlockedCompareExchange. BUG=angleproject:2682 TEST=angle_end2end_tests Change-Id: Ia409ebb10621fd5c514cf6c76f366a320a9d9fc1 Reviewed-on: https://chromium-review.googlesource.com/1208317 Reviewed-by: Bryan Bernhart <bryan.bernhart@intel.com> Reviewed-by: Corentin Wallez <cwallez@chromium.org> Commit-Queue: Corentin Wallez <cwallez@chromium.org>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175
//
// Copyright (c) 2018 The ANGLE Project Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
//
// Implementation of the function RewriteAtomicFunctionExpressions.
// See the header for more details.
#include "RewriteAtomicFunctionExpressions.h"
#include "compiler/translator/tree_util/IntermNodePatternMatcher.h"
#include "compiler/translator/tree_util/IntermNode_util.h"
#include "compiler/translator/tree_util/IntermTraverse.h"
namespace sh
{
namespace
{
// Traverser that simplifies all the atomic function expressions into the ones that can be directly
// translated into HLSL.
//
// case 1 (only for atomicExchange and atomicCompSwap):
// original:
// atomicExchange(counter, newValue);
// new:
// tempValue = atomicExchange(counter, newValue);
//
// case 2 (atomic function, temporary variable required):
// original:
// value = atomicAdd(counter, 1) * otherValue;
// someArray[atomicAdd(counter, 1)] = someOtherValue;
// new:
// value = ((tempValue = atomicAdd(counter, 1)), tempValue) * otherValue;
// someArray[((tempValue = atomicAdd(counter, 1)), tempValue)] = someOtherValue;
//
// case 3 (atomic function used directly initialize a variable):
// original:
// int value = atomicAdd(counter, 1);
// new:
// tempValue = atomicAdd(counter, 1);
// int value = tempValue;
//
class RewriteAtomicFunctionExpressionsTraverser : public TIntermTraverser
{
public:
RewriteAtomicFunctionExpressionsTraverser(TSymbolTable *symbolTable, int shaderVersion);
bool visitAggregate(Visit visit, TIntermAggregate *node) override;
bool visitBlock(Visit visit, TIntermBlock *node) override;
private:
static bool IsAtomicExchangeOrCompSwapNoReturnValue(TIntermAggregate *node,
TIntermNode *parentNode);
static bool IsAtomicFunctionInsideExpression(TIntermAggregate *node, TIntermNode *parentNode);
void rewriteAtomicFunctionCallNode(TIntermAggregate *oldAtomicFunctionNode);
const TVariable *getTempVariable(const TType *type);
int mShaderVersion;
TIntermSequence mTempVariables;
};
RewriteAtomicFunctionExpressionsTraverser::RewriteAtomicFunctionExpressionsTraverser(
TSymbolTable *symbolTable,
int shaderVersion)
: TIntermTraverser(false, false, true, symbolTable), mShaderVersion(shaderVersion)
{
}
void RewriteAtomicFunctionExpressionsTraverser::rewriteAtomicFunctionCallNode(
TIntermAggregate *oldAtomicFunctionNode)
{
ASSERT(oldAtomicFunctionNode);
const TVariable *returnVariable = getTempVariable(&oldAtomicFunctionNode->getType());
TIntermBinary *rewrittenNode = new TIntermBinary(
TOperator::EOpAssign, CreateTempSymbolNode(returnVariable), oldAtomicFunctionNode);
auto *parentNode = getParentNode();
auto *parentBinary = parentNode->getAsBinaryNode();
if (parentBinary && parentBinary->getOp() == EOpInitialize)
{
insertStatementInParentBlock(rewrittenNode);
queueReplacement(CreateTempSymbolNode(returnVariable), OriginalNode::IS_DROPPED);
}
else
{
// As all atomic function assignment will be converted to the last argument of an
// interlocked function, if we need the return value, assignment needs to be wrapped with
// the comma operator and the temporary variables.
if (!parentNode->getAsBlock())
{
rewrittenNode = TIntermBinary::CreateComma(
rewrittenNode, new TIntermSymbol(returnVariable), mShaderVersion);
}
queueReplacement(rewrittenNode, OriginalNode::IS_DROPPED);
}
}
const TVariable *RewriteAtomicFunctionExpressionsTraverser::getTempVariable(const TType *type)
{
TIntermDeclaration *variableDeclaration;
TVariable *returnVariable =
DeclareTempVariable(mSymbolTable, type, EvqTemporary, &variableDeclaration);
mTempVariables.push_back(variableDeclaration);
return returnVariable;
}
bool RewriteAtomicFunctionExpressionsTraverser::IsAtomicExchangeOrCompSwapNoReturnValue(
TIntermAggregate *node,
TIntermNode *parentNode)
{
ASSERT(node);
return (node->getOp() == EOpAtomicExchange || node->getOp() == EOpAtomicCompSwap) &&
parentNode && parentNode->getAsBlock();
}
bool RewriteAtomicFunctionExpressionsTraverser::IsAtomicFunctionInsideExpression(
TIntermAggregate *node,
TIntermNode *parentNode)
{
ASSERT(node);
// We only need to handle atomic functions with a parent that it is not block nodes. If the
// parent node is block, it means that the atomic function is not inside an expression.
if (!IsAtomicFunction(node->getOp()) || parentNode->getAsBlock())
{
return false;
}
auto *parentAsBinary = parentNode->getAsBinaryNode();
// Assignments are handled in OutputHLSL
return !parentAsBinary || parentAsBinary->getOp() != EOpAssign;
}
bool RewriteAtomicFunctionExpressionsTraverser::visitAggregate(Visit visit, TIntermAggregate *node)
{
ASSERT(visit == PostVisit);
TIntermNode *parentNode = getParentNode();
if (IsAtomicExchangeOrCompSwapNoReturnValue(node, parentNode) ||
IsAtomicFunctionInsideExpression(node, parentNode))
{
rewriteAtomicFunctionCallNode(node);
}
return true;
}
bool RewriteAtomicFunctionExpressionsTraverser::visitBlock(Visit visit, TIntermBlock *node)
{
ASSERT(visit == PostVisit);
if (!mTempVariables.empty() && getParentNode()->getAsFunctionDefinition())
{
insertStatementsInBlockAtPosition(node, 0, mTempVariables, TIntermSequence());
mTempVariables.clear();
}
return true;
}
} // anonymous namespace
void RewriteAtomicFunctionExpressions(TIntermNode *root,
TSymbolTable *symbolTable,
int shaderVersion)
{
RewriteAtomicFunctionExpressionsTraverser traverser(symbolTable, shaderVersion);
traverser.traverse(root);
traverser.updateTree();
}
} // namespace sh