AuroraMiddleware/SPIRV-Tools
1
0
Fork 0
mirror of https://github.com/KhronosGroup/SPIRV-Tools synced 2024-11-27 05:40:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
03cbf33a69
SPIRV-Tools/test/opt/pass_test.cpp

243 lines
8.2 KiB
C++
Raw Normal View History

Create the dead function elimination pass Creates a pass called eliminate dead functions that looks for functions that could never be called, and deletes them from the module. To support this change a new function was added to the Pass class to traverse the call trees from diffent starting points. Includes a test to ensure that annotations are removed when deleting a dead function. They were not, so fixed that up as well. Did some cleanup of the assembly for the test in pass_test.cpp. Trying to make them smaller and easier to read.
2017-09-19 14:12:13 +00:00
// Copyright (c) 2017 Google Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
Cleanup includes. (#1795) This Cl cleans up the include paths to be relative to the top level directory. Various include-what-you-use fixes have been added.
2018-08-03 19:06:09 +00:00
#include <memory>
Create the dead function elimination pass Creates a pass called eliminate dead functions that looks for functions that could never be called, and deletes them from the module. To support this change a new function was added to the Pass class to traverse the call trees from diffent starting points. Includes a test to ensure that annotations are removed when deleting a dead function. They were not, so fixed that up as well. Did some cleanup of the assembly for the test in pass_test.cpp. Trying to make them smaller and easier to read.
2017-09-19 14:12:13 +00:00
#include <string>
#include <vector>
Cleanup includes. (#1795) This Cl cleans up the include paths to be relative to the top level directory. Various include-what-you-use fixes have been added.
2018-08-03 19:06:09 +00:00
#include "gmock/gmock.h"
#include "source/opt/pass.h"
#include "test/opt/assembly_builder.h"
#include "test/opt/pass_fixture.h"
#include "test/opt/pass_utils.h"
Create the dead function elimination pass Creates a pass called eliminate dead functions that looks for functions that could never be called, and deletes them from the module. To support this change a new function was added to the Pass class to traverse the call trees from diffent starting points. Includes a test to ensure that annotations are removed when deleting a dead function. They were not, so fixed that up as well. Did some cleanup of the assembly for the test in pass_test.cpp. Trying to make them smaller and easier to read.
2017-09-19 14:12:13 +00:00
Move tests into namespaces (#1689) This CL moves the test into namespaces based on their directories.
2018-07-11 13:24:49 +00:00
namespace spvtools {
namespace opt {
Create the dead function elimination pass Creates a pass called eliminate dead functions that looks for functions that could never be called, and deletes them from the module. To support this change a new function was added to the Pass class to traverse the call trees from diffent starting points. Includes a test to ensure that annotations are removed when deleting a dead function. They were not, so fixed that up as well. Did some cleanup of the assembly for the test in pass_test.cpp. Trying to make them smaller and easier to read.
2017-09-19 14:12:13 +00:00
namespace {
Move tests into namespaces (#1689) This CL moves the test into namespaces based on their directories.
2018-07-11 13:24:49 +00:00
class DummyPass : public Pass {
Create the dead function elimination pass Creates a pass called eliminate dead functions that looks for functions that could never be called, and deletes them from the module. To support this change a new function was added to the Pass class to traverse the call trees from diffent starting points. Includes a test to ensure that annotations are removed when deleting a dead function. They were not, so fixed that up as well. Did some cleanup of the assembly for the test in pass_test.cpp. Trying to make them smaller and easier to read.
2017-09-19 14:12:13 +00:00
public:
const char* name() const override { return "dummy-pass"; }
use Pass::Run to set the context on each pass. (#1708) Currently the IRContext is passed into the Pass::Process method. It is then up to the individual pass to store the context into the context_ variable. This CL changes the Run method to store the context before calling Process which no-longer receives the context as a parameter.
2018-07-12 13:08:45 +00:00
Status Process() override { return Status::SuccessWithoutChange; }
Create the dead function elimination pass Creates a pass called eliminate dead functions that looks for functions that could never be called, and deletes them from the module. To support this change a new function was added to the Pass class to traverse the call trees from diffent starting points. Includes a test to ensure that annotations are removed when deleting a dead function. They were not, so fixed that up as well. Did some cleanup of the assembly for the test in pass_test.cpp. Trying to make them smaller and easier to read.
2017-09-19 14:12:13 +00:00
};
using ::testing::UnorderedElementsAre;
using PassClassTest = PassTest<::testing::Test>;
TEST_F(PassClassTest, BasicVisitFromEntryPoint) {
// Make sure we visit the entry point, and the function it calls.
// Do not visit Dead or Exported.
const std::string text = R"(
OpCapability Shader
OpMemoryModel Logical GLSL450
OpEntryPoint Fragment %10 "main"
OpName %10 "main"
OpName %Dead "Dead"
OpName %11 "Constant"
OpName %ExportedFunc "ExportedFunc"
OpDecorate %ExportedFunc LinkageAttributes "ExportedFunc" Export
%void = OpTypeVoid
%6 = OpTypeFunction %void
%10 = OpFunction %void None %6
%14 = OpLabel
%15 = OpFunctionCall %void %11
%16 = OpFunctionCall %void %11
OpReturn
OpFunctionEnd
%11 = OpFunction %void None %6
%18 = OpLabel
OpReturn
OpFunctionEnd
%Dead = OpFunction %void None %6
%19 = OpLabel
OpReturn
OpFunctionEnd
%ExportedFunc = OpFunction %void None %7
%20 = OpLabel
%21 = OpFunctionCall %void %11
OpReturn
OpFunctionEnd
)";
// clang-format on
Move tests into namespaces (#1689) This CL moves the test into namespaces based on their directories.
2018-07-11 13:24:49 +00:00
std::unique_ptr<IRContext> localContext =
Create the dead function elimination pass Creates a pass called eliminate dead functions that looks for functions that could never be called, and deletes them from the module. To support this change a new function was added to the Pass class to traverse the call trees from diffent starting points. Includes a test to ensure that annotations are removed when deleting a dead function. They were not, so fixed that up as well. Did some cleanup of the assembly for the test in pass_test.cpp. Trying to make them smaller and easier to read.
2017-09-19 14:12:13 +00:00
BuildModule(SPV_ENV_UNIVERSAL_1_1, nullptr, text,
SPV_TEXT_TO_BINARY_OPTION_PRESERVE_NUMERIC_IDS);
Adding an unique id to Instruction generated by IRContext Each instruction is given an unique id that can be used for ordering purposes. The ids are generated via the IRContext. Major changes: * Instructions now contain a uint32_t for unique id and a cached context pointer * Most constructors have been modified to take a context as input * unfortunately I cannot remove the default and copy constructors, but developers should avoid these * Added accessors to parents of basic block and function * Removed the copy constructors for BasicBlock and Function and replaced them with Clone functions * Reworked BuildModule to return an IRContext owning the built module * Since all instructions require a context, the context now becomes the basic unit for IR * Added a constructor to context to create an owned module internally * Replaced uses of Instruction's copy constructor with Clone whereever I found them * Reworked the linker functionality to perform clones into a different context instead of moves * Updated many tests to be consistent with the above changes * Still need to add new tests to cover added functionality * Added comparison operators to Instruction * Added an internal option to LinkerOptions to verify merged ids are unique * Added a test for the linker to verify merged ids are unique * Updated MergeReturnPass to supply a context * Updated DecorationManager to supply a context for cloned decorations * Reworked several portions of the def use tests in anticipation of next set of changes
2017-11-14 19:11:50 +00:00
EXPECT_NE(nullptr, localContext) << "Assembling failed for shader:\n"
<< text << std::endl;
Create the dead function elimination pass Creates a pass called eliminate dead functions that looks for functions that could never be called, and deletes them from the module. To support this change a new function was added to the Pass class to traverse the call trees from diffent starting points. Includes a test to ensure that annotations are removed when deleting a dead function. They were not, so fixed that up as well. Did some cleanup of the assembly for the test in pass_test.cpp. Trying to make them smaller and easier to read.
2017-09-19 14:12:13 +00:00
DummyPass testPass;
std::vector<uint32_t> processed;
Move tests into namespaces (#1689) This CL moves the test into namespaces based on their directories.
2018-07-11 13:24:49 +00:00
Pass::ProcessFunction mark_visited = [&processed](Function* fp) {
Create the dead function elimination pass Creates a pass called eliminate dead functions that looks for functions that could never be called, and deletes them from the module. To support this change a new function was added to the Pass class to traverse the call trees from diffent starting points. Includes a test to ensure that annotations are removed when deleting a dead function. They were not, so fixed that up as well. Did some cleanup of the assembly for the test in pass_test.cpp. Trying to make them smaller and easier to read.
2017-09-19 14:12:13 +00:00
processed.push_back(fp->result_id());
return false;
};
Adding an unique id to Instruction generated by IRContext Each instruction is given an unique id that can be used for ordering purposes. The ids are generated via the IRContext. Major changes: * Instructions now contain a uint32_t for unique id and a cached context pointer * Most constructors have been modified to take a context as input * unfortunately I cannot remove the default and copy constructors, but developers should avoid these * Added accessors to parents of basic block and function * Removed the copy constructors for BasicBlock and Function and replaced them with Clone functions * Reworked BuildModule to return an IRContext owning the built module * Since all instructions require a context, the context now becomes the basic unit for IR * Added a constructor to context to create an owned module internally * Replaced uses of Instruction's copy constructor with Clone whereever I found them * Reworked the linker functionality to perform clones into a different context instead of moves * Updated many tests to be consistent with the above changes * Still need to add new tests to cover added functionality * Added comparison operators to Instruction * Added an internal option to LinkerOptions to verify merged ids are unique * Added a test for the linker to verify merged ids are unique * Updated MergeReturnPass to supply a context * Updated DecorationManager to supply a context for cloned decorations * Reworked several portions of the def use tests in anticipation of next set of changes
2017-11-14 19:11:50 +00:00
testPass.ProcessEntryPointCallTree(mark_visited, localContext->module());
Create the dead function elimination pass Creates a pass called eliminate dead functions that looks for functions that could never be called, and deletes them from the module. To support this change a new function was added to the Pass class to traverse the call trees from diffent starting points. Includes a test to ensure that annotations are removed when deleting a dead function. They were not, so fixed that up as well. Did some cleanup of the assembly for the test in pass_test.cpp. Trying to make them smaller and easier to read.
2017-09-19 14:12:13 +00:00
EXPECT_THAT(processed, UnorderedElementsAre(10, 11));
}
TEST_F(PassClassTest, BasicVisitReachable) {
// Make sure we visit the entry point, exported function, and the function
// they call. Do not visit Dead.
const std::string text = R"(
OpCapability Shader
OpMemoryModel Logical GLSL450
OpEntryPoint Fragment %10 "main"
OpName %10 "main"
OpName %Dead "Dead"
OpName %11 "Constant"
OpName %12 "ExportedFunc"
OpName %13 "Constant2"
OpDecorate %12 LinkageAttributes "ExportedFunc" Export
%void = OpTypeVoid
%6 = OpTypeFunction %void
%10 = OpFunction %void None %6
%14 = OpLabel
%15 = OpFunctionCall %void %11
%16 = OpFunctionCall %void %11
OpReturn
OpFunctionEnd
%11 = OpFunction %void None %6
%18 = OpLabel
OpReturn
OpFunctionEnd
%Dead = OpFunction %void None %6
%19 = OpLabel
OpReturn
OpFunctionEnd
%12 = OpFunction %void None %9
%20 = OpLabel
%21 = OpFunctionCall %void %13
OpReturn
OpFunctionEnd
%13 = OpFunction %void None %6
%22 = OpLabel
OpReturn
OpFunctionEnd
)";
// clang-format on
Move tests into namespaces (#1689) This CL moves the test into namespaces based on their directories.
2018-07-11 13:24:49 +00:00
std::unique_ptr<IRContext> localContext =
Create the dead function elimination pass Creates a pass called eliminate dead functions that looks for functions that could never be called, and deletes them from the module. To support this change a new function was added to the Pass class to traverse the call trees from diffent starting points. Includes a test to ensure that annotations are removed when deleting a dead function. They were not, so fixed that up as well. Did some cleanup of the assembly for the test in pass_test.cpp. Trying to make them smaller and easier to read.
2017-09-19 14:12:13 +00:00
BuildModule(SPV_ENV_UNIVERSAL_1_1, nullptr, text,
SPV_TEXT_TO_BINARY_OPTION_PRESERVE_NUMERIC_IDS);
Adding an unique id to Instruction generated by IRContext Each instruction is given an unique id that can be used for ordering purposes. The ids are generated via the IRContext. Major changes: * Instructions now contain a uint32_t for unique id and a cached context pointer * Most constructors have been modified to take a context as input * unfortunately I cannot remove the default and copy constructors, but developers should avoid these * Added accessors to parents of basic block and function * Removed the copy constructors for BasicBlock and Function and replaced them with Clone functions * Reworked BuildModule to return an IRContext owning the built module * Since all instructions require a context, the context now becomes the basic unit for IR * Added a constructor to context to create an owned module internally * Replaced uses of Instruction's copy constructor with Clone whereever I found them * Reworked the linker functionality to perform clones into a different context instead of moves * Updated many tests to be consistent with the above changes * Still need to add new tests to cover added functionality * Added comparison operators to Instruction * Added an internal option to LinkerOptions to verify merged ids are unique * Added a test for the linker to verify merged ids are unique * Updated MergeReturnPass to supply a context * Updated DecorationManager to supply a context for cloned decorations * Reworked several portions of the def use tests in anticipation of next set of changes
2017-11-14 19:11:50 +00:00
EXPECT_NE(nullptr, localContext) << "Assembling failed for shader:\n"
<< text << std::endl;
Add the IRContext (part 1) This is the first part of adding the IRContext. This class is meant to hold the extra data that is build on top of the module that it owns. The first part will simply create the IRContext class and get it passed to the passes in place of the module. For now it does not have any functionality of its own, but it acts more as a wrapper for the module. The functions that I added to the IRContext are those that either traverse the headers or add to them. I did this because we may decide to have other ways of dealing with these sections (for example adding a type pool, or use the decoration manager). I also added the function that add to the header because the IRContext needs to know when an instruction is added to update other data structures appropriately. Note that there is still lots of work that needs to be done. There are still many places that change the module, and do not inform the context. That will be the next step.
2017-10-30 15:13:24 +00:00
Create the dead function elimination pass Creates a pass called eliminate dead functions that looks for functions that could never be called, and deletes them from the module. To support this change a new function was added to the Pass class to traverse the call trees from diffent starting points. Includes a test to ensure that annotations are removed when deleting a dead function. They were not, so fixed that up as well. Did some cleanup of the assembly for the test in pass_test.cpp. Trying to make them smaller and easier to read.
2017-09-19 14:12:13 +00:00
DummyPass testPass;
std::vector<uint32_t> processed;
Move tests into namespaces (#1689) This CL moves the test into namespaces based on their directories.
2018-07-11 13:24:49 +00:00
Pass::ProcessFunction mark_visited = [&processed](Function* fp) {
Create the dead function elimination pass Creates a pass called eliminate dead functions that looks for functions that could never be called, and deletes them from the module. To support this change a new function was added to the Pass class to traverse the call trees from diffent starting points. Includes a test to ensure that annotations are removed when deleting a dead function. They were not, so fixed that up as well. Did some cleanup of the assembly for the test in pass_test.cpp. Trying to make them smaller and easier to read.
2017-09-19 14:12:13 +00:00
processed.push_back(fp->result_id());
return false;
};
Adding an unique id to Instruction generated by IRContext Each instruction is given an unique id that can be used for ordering purposes. The ids are generated via the IRContext. Major changes: * Instructions now contain a uint32_t for unique id and a cached context pointer * Most constructors have been modified to take a context as input * unfortunately I cannot remove the default and copy constructors, but developers should avoid these * Added accessors to parents of basic block and function * Removed the copy constructors for BasicBlock and Function and replaced them with Clone functions * Reworked BuildModule to return an IRContext owning the built module * Since all instructions require a context, the context now becomes the basic unit for IR * Added a constructor to context to create an owned module internally * Replaced uses of Instruction's copy constructor with Clone whereever I found them * Reworked the linker functionality to perform clones into a different context instead of moves * Updated many tests to be consistent with the above changes * Still need to add new tests to cover added functionality * Added comparison operators to Instruction * Added an internal option to LinkerOptions to verify merged ids are unique * Added a test for the linker to verify merged ids are unique * Updated MergeReturnPass to supply a context * Updated DecorationManager to supply a context for cloned decorations * Reworked several portions of the def use tests in anticipation of next set of changes
2017-11-14 19:11:50 +00:00
testPass.ProcessReachableCallTree(mark_visited, localContext.get());
Create the dead function elimination pass Creates a pass called eliminate dead functions that looks for functions that could never be called, and deletes them from the module. To support this change a new function was added to the Pass class to traverse the call trees from diffent starting points. Includes a test to ensure that annotations are removed when deleting a dead function. They were not, so fixed that up as well. Did some cleanup of the assembly for the test in pass_test.cpp. Trying to make them smaller and easier to read.
2017-09-19 14:12:13 +00:00
EXPECT_THAT(processed, UnorderedElementsAre(10, 11, 12, 13));
}
TEST_F(PassClassTest, BasicVisitOnlyOnce) {
// Make sure we visit %11 only once, even if it is called from two different
// functions.
const std::string text = R"(
OpCapability Shader
OpMemoryModel Logical GLSL450
OpEntryPoint Fragment %10 "main" %gl_FragColor
OpName %10 "main"
OpName %Dead "Dead"
OpName %11 "Constant"
OpName %12 "ExportedFunc"
OpDecorate %12 LinkageAttributes "ExportedFunc" Export
%void = OpTypeVoid
%6 = OpTypeFunction %void
%10 = OpFunction %void None %6
%14 = OpLabel
%15 = OpFunctionCall %void %11
%16 = OpFunctionCall %void %12
OpReturn
OpFunctionEnd
%11 = OpFunction %void None %6
%18 = OpLabel
%19 = OpFunctionCall %void %12
OpReturn
OpFunctionEnd
%Dead = OpFunction %void None %6
%20 = OpLabel
OpReturn
OpFunctionEnd
%12 = OpFunction %void None %9
%21 = OpLabel
OpReturn
OpFunctionEnd
)";
// clang-format on
Move tests into namespaces (#1689) This CL moves the test into namespaces based on their directories.
2018-07-11 13:24:49 +00:00
std::unique_ptr<IRContext> localContext =
Create the dead function elimination pass Creates a pass called eliminate dead functions that looks for functions that could never be called, and deletes them from the module. To support this change a new function was added to the Pass class to traverse the call trees from diffent starting points. Includes a test to ensure that annotations are removed when deleting a dead function. They were not, so fixed that up as well. Did some cleanup of the assembly for the test in pass_test.cpp. Trying to make them smaller and easier to read.
2017-09-19 14:12:13 +00:00
BuildModule(SPV_ENV_UNIVERSAL_1_1, nullptr, text,
SPV_TEXT_TO_BINARY_OPTION_PRESERVE_NUMERIC_IDS);
Adding an unique id to Instruction generated by IRContext Each instruction is given an unique id that can be used for ordering purposes. The ids are generated via the IRContext. Major changes: * Instructions now contain a uint32_t for unique id and a cached context pointer * Most constructors have been modified to take a context as input * unfortunately I cannot remove the default and copy constructors, but developers should avoid these * Added accessors to parents of basic block and function * Removed the copy constructors for BasicBlock and Function and replaced them with Clone functions * Reworked BuildModule to return an IRContext owning the built module * Since all instructions require a context, the context now becomes the basic unit for IR * Added a constructor to context to create an owned module internally * Replaced uses of Instruction's copy constructor with Clone whereever I found them * Reworked the linker functionality to perform clones into a different context instead of moves * Updated many tests to be consistent with the above changes * Still need to add new tests to cover added functionality * Added comparison operators to Instruction * Added an internal option to LinkerOptions to verify merged ids are unique * Added a test for the linker to verify merged ids are unique * Updated MergeReturnPass to supply a context * Updated DecorationManager to supply a context for cloned decorations * Reworked several portions of the def use tests in anticipation of next set of changes
2017-11-14 19:11:50 +00:00
EXPECT_NE(nullptr, localContext) << "Assembling failed for shader:\n"
<< text << std::endl;
Add the IRContext (part 1) This is the first part of adding the IRContext. This class is meant to hold the extra data that is build on top of the module that it owns. The first part will simply create the IRContext class and get it passed to the passes in place of the module. For now it does not have any functionality of its own, but it acts more as a wrapper for the module. The functions that I added to the IRContext are those that either traverse the headers or add to them. I did this because we may decide to have other ways of dealing with these sections (for example adding a type pool, or use the decoration manager). I also added the function that add to the header because the IRContext needs to know when an instruction is added to update other data structures appropriately. Note that there is still lots of work that needs to be done. There are still many places that change the module, and do not inform the context. That will be the next step.
2017-10-30 15:13:24 +00:00
Create the dead function elimination pass Creates a pass called eliminate dead functions that looks for functions that could never be called, and deletes them from the module. To support this change a new function was added to the Pass class to traverse the call trees from diffent starting points. Includes a test to ensure that annotations are removed when deleting a dead function. They were not, so fixed that up as well. Did some cleanup of the assembly for the test in pass_test.cpp. Trying to make them smaller and easier to read.
2017-09-19 14:12:13 +00:00
DummyPass testPass;
std::vector<uint32_t> processed;
Move tests into namespaces (#1689) This CL moves the test into namespaces based on their directories.
2018-07-11 13:24:49 +00:00
Pass::ProcessFunction mark_visited = [&processed](Function* fp) {
Create the dead function elimination pass Creates a pass called eliminate dead functions that looks for functions that could never be called, and deletes them from the module. To support this change a new function was added to the Pass class to traverse the call trees from diffent starting points. Includes a test to ensure that annotations are removed when deleting a dead function. They were not, so fixed that up as well. Did some cleanup of the assembly for the test in pass_test.cpp. Trying to make them smaller and easier to read.
2017-09-19 14:12:13 +00:00
processed.push_back(fp->result_id());
return false;
};
Adding an unique id to Instruction generated by IRContext Each instruction is given an unique id that can be used for ordering purposes. The ids are generated via the IRContext. Major changes: * Instructions now contain a uint32_t for unique id and a cached context pointer * Most constructors have been modified to take a context as input * unfortunately I cannot remove the default and copy constructors, but developers should avoid these * Added accessors to parents of basic block and function * Removed the copy constructors for BasicBlock and Function and replaced them with Clone functions * Reworked BuildModule to return an IRContext owning the built module * Since all instructions require a context, the context now becomes the basic unit for IR * Added a constructor to context to create an owned module internally * Replaced uses of Instruction's copy constructor with Clone whereever I found them * Reworked the linker functionality to perform clones into a different context instead of moves * Updated many tests to be consistent with the above changes * Still need to add new tests to cover added functionality * Added comparison operators to Instruction * Added an internal option to LinkerOptions to verify merged ids are unique * Added a test for the linker to verify merged ids are unique * Updated MergeReturnPass to supply a context * Updated DecorationManager to supply a context for cloned decorations * Reworked several portions of the def use tests in anticipation of next set of changes
2017-11-14 19:11:50 +00:00
testPass.ProcessReachableCallTree(mark_visited, localContext.get());
Create the dead function elimination pass Creates a pass called eliminate dead functions that looks for functions that could never be called, and deletes them from the module. To support this change a new function was added to the Pass class to traverse the call trees from diffent starting points. Includes a test to ensure that annotations are removed when deleting a dead function. They were not, so fixed that up as well. Did some cleanup of the assembly for the test in pass_test.cpp. Trying to make them smaller and easier to read.
2017-09-19 14:12:13 +00:00
EXPECT_THAT(processed, UnorderedElementsAre(10, 11, 12));
}
TEST_F(PassClassTest, BasicDontVisitExportedVariable) {
// Make sure we only visit functions and not exported variables.
const std::string text = R"(
OpCapability Shader
OpMemoryModel Logical GLSL450
OpEntryPoint Fragment %10 "main" %gl_FragColor
OpExecutionMode %10 OriginUpperLeft
OpSource GLSL 150
OpName %10 "main"
OpName %Dead "Dead"
OpName %11 "Constant"
OpName %12 "export_var"
OpDecorate %12 LinkageAttributes "export_var" Export
%void = OpTypeVoid
%6 = OpTypeFunction %void
%float = OpTypeFloat 32
%float_1 = OpConstant %float 1
%12 = OpVariable %float Output
%10 = OpFunction %void None %6
%14 = OpLabel
OpStore %12 %float_1
OpReturn
OpFunctionEnd
)";
// clang-format on
Move tests into namespaces (#1689) This CL moves the test into namespaces based on their directories.
2018-07-11 13:24:49 +00:00
std::unique_ptr<IRContext> localContext =
Create the dead function elimination pass Creates a pass called eliminate dead functions that looks for functions that could never be called, and deletes them from the module. To support this change a new function was added to the Pass class to traverse the call trees from diffent starting points. Includes a test to ensure that annotations are removed when deleting a dead function. They were not, so fixed that up as well. Did some cleanup of the assembly for the test in pass_test.cpp. Trying to make them smaller and easier to read.
2017-09-19 14:12:13 +00:00
BuildModule(SPV_ENV_UNIVERSAL_1_1, nullptr, text,
SPV_TEXT_TO_BINARY_OPTION_PRESERVE_NUMERIC_IDS);
Adding an unique id to Instruction generated by IRContext Each instruction is given an unique id that can be used for ordering purposes. The ids are generated via the IRContext. Major changes: * Instructions now contain a uint32_t for unique id and a cached context pointer * Most constructors have been modified to take a context as input * unfortunately I cannot remove the default and copy constructors, but developers should avoid these * Added accessors to parents of basic block and function * Removed the copy constructors for BasicBlock and Function and replaced them with Clone functions * Reworked BuildModule to return an IRContext owning the built module * Since all instructions require a context, the context now becomes the basic unit for IR * Added a constructor to context to create an owned module internally * Replaced uses of Instruction's copy constructor with Clone whereever I found them * Reworked the linker functionality to perform clones into a different context instead of moves * Updated many tests to be consistent with the above changes * Still need to add new tests to cover added functionality * Added comparison operators to Instruction * Added an internal option to LinkerOptions to verify merged ids are unique * Added a test for the linker to verify merged ids are unique * Updated MergeReturnPass to supply a context * Updated DecorationManager to supply a context for cloned decorations * Reworked several portions of the def use tests in anticipation of next set of changes
2017-11-14 19:11:50 +00:00
EXPECT_NE(nullptr, localContext) << "Assembling failed for shader:\n"
<< text << std::endl;
Add the IRContext (part 1) This is the first part of adding the IRContext. This class is meant to hold the extra data that is build on top of the module that it owns. The first part will simply create the IRContext class and get it passed to the passes in place of the module. For now it does not have any functionality of its own, but it acts more as a wrapper for the module. The functions that I added to the IRContext are those that either traverse the headers or add to them. I did this because we may decide to have other ways of dealing with these sections (for example adding a type pool, or use the decoration manager). I also added the function that add to the header because the IRContext needs to know when an instruction is added to update other data structures appropriately. Note that there is still lots of work that needs to be done. There are still many places that change the module, and do not inform the context. That will be the next step.
2017-10-30 15:13:24 +00:00
Create the dead function elimination pass Creates a pass called eliminate dead functions that looks for functions that could never be called, and deletes them from the module. To support this change a new function was added to the Pass class to traverse the call trees from diffent starting points. Includes a test to ensure that annotations are removed when deleting a dead function. They were not, so fixed that up as well. Did some cleanup of the assembly for the test in pass_test.cpp. Trying to make them smaller and easier to read.
2017-09-19 14:12:13 +00:00
DummyPass testPass;
std::vector<uint32_t> processed;
Move tests into namespaces (#1689) This CL moves the test into namespaces based on their directories.
2018-07-11 13:24:49 +00:00
Pass::ProcessFunction mark_visited = [&processed](Function* fp) {
Create the dead function elimination pass Creates a pass called eliminate dead functions that looks for functions that could never be called, and deletes them from the module. To support this change a new function was added to the Pass class to traverse the call trees from diffent starting points. Includes a test to ensure that annotations are removed when deleting a dead function. They were not, so fixed that up as well. Did some cleanup of the assembly for the test in pass_test.cpp. Trying to make them smaller and easier to read.
2017-09-19 14:12:13 +00:00
processed.push_back(fp->result_id());
return false;
};
Adding an unique id to Instruction generated by IRContext Each instruction is given an unique id that can be used for ordering purposes. The ids are generated via the IRContext. Major changes: * Instructions now contain a uint32_t for unique id and a cached context pointer * Most constructors have been modified to take a context as input * unfortunately I cannot remove the default and copy constructors, but developers should avoid these * Added accessors to parents of basic block and function * Removed the copy constructors for BasicBlock and Function and replaced them with Clone functions * Reworked BuildModule to return an IRContext owning the built module * Since all instructions require a context, the context now becomes the basic unit for IR * Added a constructor to context to create an owned module internally * Replaced uses of Instruction's copy constructor with Clone whereever I found them * Reworked the linker functionality to perform clones into a different context instead of moves * Updated many tests to be consistent with the above changes * Still need to add new tests to cover added functionality * Added comparison operators to Instruction * Added an internal option to LinkerOptions to verify merged ids are unique * Added a test for the linker to verify merged ids are unique * Updated MergeReturnPass to supply a context * Updated DecorationManager to supply a context for cloned decorations * Reworked several portions of the def use tests in anticipation of next set of changes
2017-11-14 19:11:50 +00:00
testPass.ProcessReachableCallTree(mark_visited, localContext.get());
Create the dead function elimination pass Creates a pass called eliminate dead functions that looks for functions that could never be called, and deletes them from the module. To support this change a new function was added to the Pass class to traverse the call trees from diffent starting points. Includes a test to ensure that annotations are removed when deleting a dead function. They were not, so fixed that up as well. Did some cleanup of the assembly for the test in pass_test.cpp. Trying to make them smaller and easier to read.
2017-09-19 14:12:13 +00:00
EXPECT_THAT(processed, UnorderedElementsAre(10));
}
Move tests into namespaces (#1689) This CL moves the test into namespaces based on their directories.
2018-07-11 13:24:49 +00:00
Create the dead function elimination pass Creates a pass called eliminate dead functions that looks for functions that could never be called, and deletes them from the module. To support this change a new function was added to the Pass class to traverse the call trees from diffent starting points. Includes a test to ensure that annotations are removed when deleting a dead function. They were not, so fixed that up as well. Did some cleanup of the assembly for the test in pass_test.cpp. Trying to make them smaller and easier to read.
2017-09-19 14:12:13 +00:00
} // namespace
Move tests into namespaces (#1689) This CL moves the test into namespaces based on their directories.
2018-07-11 13:24:49 +00:00
} // namespace opt
} // namespace spvtools
Reference in New Issue Copy Permalink