Simplify ult - prefer debug manager state restorer

KamilKoprykIntel · Compute-Runtime-Automation · commit 27c90ac2d660 · 2022-02-03T19:45:46.000+01:00
Signed-off-by: Kamil Kopryk &lt;kamil.kopryk@intel.com&gt;
diff --git a/opencl/test/unit_test/program/program_tests.cpp b/opencl/test/unit_test/program/program_tests.cpp
@@ -1707,9 +1707,8 @@ TEST_F(ProgramTests, givenDeviceThatSupportsSharedSystemMemoryAllocationWhenProg
 }
 
 TEST_F(ProgramTests, GivenForce32BitAddressessWhenProgramIsCreatedThenGreaterThan4gbBuffersRequiredIsCorrectlySet) {
+    DebugManagerStateRestore dbgRestorer;
     cl_int retVal = CL_DEVICE_NOT_FOUND;
-    auto defaultSetting = DebugManager.flags.DisableStatelessToStatefulOptimization.get();
-
     DebugManager.flags.DisableStatelessToStatefulOptimization.set(false);
     if (pDevice) {
         const_cast<DeviceInfo *>(&pDevice->getDeviceInfo())->force32BitAddressess = true;
@@ -1723,12 +1722,10 @@ TEST_F(ProgramTests, GivenForce32BitAddressessWhenProgramIsCreatedThenGreaterTha
     } else {
         EXPECT_NE(CL_DEVICE_NOT_FOUND, retVal);
     }
-    DebugManager.flags.DisableStatelessToStatefulOptimization.set(defaultSetting);
 }
 
 TEST_F(ProgramTests, Given32bitSupportWhenProgramIsCreatedThenGreaterThan4gbBuffersRequiredIsCorrectlySet) {
-    auto defaultSetting = DebugManager.flags.DisableStatelessToStatefulOptimization.get();
-
+    DebugManagerStateRestore dbgRestorer;
     DebugManager.flags.DisableStatelessToStatefulOptimization.set(false);
     std::unique_ptr<MockProgram> program{Program::createBuiltInFromSource<MockProgram>("", pContext, pContext->getDevices(), nullptr)};
     auto internalOptions = program->getInternalOptions();
@@ -1737,17 +1734,14 @@ TEST_F(ProgramTests, Given32bitSupportWhenProgramIsCreatedThenGreaterThan4gbBuff
     } else {
         EXPECT_TRUE(CompilerOptions::contains(internalOptions, NEO::CompilerOptions::greaterThan4gbBuffersRequired)) << internalOptions;
     }
-    DebugManager.flags.DisableStatelessToStatefulOptimization.set(defaultSetting);
 }
 
 TEST_F(ProgramTests, GivenStatelessToStatefulIsDisabledWhenProgramIsCreatedThenGreaterThan4gbBuffersRequiredIsCorrectlySet) {
-    auto defaultSetting = DebugManager.flags.DisableStatelessToStatefulOptimization.get();
-
+    DebugManagerStateRestore dbgRestorer;
     DebugManager.flags.DisableStatelessToStatefulOptimization.set(true);
     std::unique_ptr<MockProgram> program{Program::createBuiltInFromSource<MockProgram>("", pContext, pContext->getDevices(), nullptr)};
     auto internalOptions = program->getInternalOptions();
     EXPECT_TRUE(CompilerOptions::contains(internalOptions, NEO::CompilerOptions::greaterThan4gbBuffersRequired)) << internalOptions;
-    DebugManager.flags.DisableStatelessToStatefulOptimization.set(defaultSetting);
 }
 
 TEST_F(ProgramTests, givenProgramWhenItIsCompiledThenItAlwaysHavePreserveVec3TypeInternalOptionSet) {
@@ -1757,8 +1751,7 @@ TEST_F(ProgramTests, givenProgramWhenItIsCompiledThenItAlwaysHavePreserveVec3Typ
 }
 
 TEST_F(ProgramTests, Force32BitAddressessWhenProgramIsCreatedThenGreaterThan4gbBuffersRequiredIsCorrectlySet) {
-    auto defaultSetting = DebugManager.flags.DisableStatelessToStatefulOptimization.get();
-
+    DebugManagerStateRestore dbgRestorer;
     DebugManager.flags.DisableStatelessToStatefulOptimization.set(false);
     const_cast<DeviceInfo *>(&pDevice->getDeviceInfo())->force32BitAddressess = true;
     std::unique_ptr<MockProgram> program{Program::createBuiltInFromSource<MockProgram>("", pContext, pContext->getDevices(), nullptr)};
@@ -1772,7 +1765,6 @@ TEST_F(ProgramTests, Force32BitAddressessWhenProgramIsCreatedThenGreaterThan4gbB
             EXPECT_TRUE(CompilerOptions::contains(internalOptions, NEO::CompilerOptions::greaterThan4gbBuffersRequired)) << internalOptions;
         }
     }
-    DebugManager.flags.DisableStatelessToStatefulOptimization.set(defaultSetting);
 }
 
 TEST_F(ProgramTests, GivenStatelessToStatefulBufferOffsetOptimizationWhenProgramIsCreatedThenBufferOffsetArgIsSet) {

Original file line number	Diff line number	Diff line change
`@@ -1707,9 +1707,8 @@ TEST_F(ProgramTests, givenDeviceThatSupportsSharedSystemMemoryAllocationWhenProg`
`1707`	`1707`	`}`
`1708`	`1708`
`1709`	`1709`	`TEST_F(ProgramTests, GivenForce32BitAddressessWhenProgramIsCreatedThenGreaterThan4gbBuffersRequiredIsCorrectlySet) {`
	`1710`	`+ DebugManagerStateRestore dbgRestorer;`
`1710`	`1711`	`cl_int retVal = CL_DEVICE_NOT_FOUND;`
`1711`		`- auto defaultSetting = DebugManager.flags.DisableStatelessToStatefulOptimization.get();`
`1712`		`-`
`1713`	`1712`	`DebugManager.flags.DisableStatelessToStatefulOptimization.set(false);`
`1714`	`1713`	`if (pDevice) {`
`1715`	`1714`	`const_cast<DeviceInfo *>(&pDevice->getDeviceInfo())->force32BitAddressess = true;`
`@@ -1723,12 +1722,10 @@ TEST_F(ProgramTests, GivenForce32BitAddressessWhenProgramIsCreatedThenGreaterTha`
`1723`	`1722`	`} else {`
`1724`	`1723`	`EXPECT_NE(CL_DEVICE_NOT_FOUND, retVal);`
`1725`	`1724`	`}`
`1726`		`- DebugManager.flags.DisableStatelessToStatefulOptimization.set(defaultSetting);`
`1727`	`1725`	`}`
`1728`	`1726`
`1729`	`1727`	`TEST_F(ProgramTests, Given32bitSupportWhenProgramIsCreatedThenGreaterThan4gbBuffersRequiredIsCorrectlySet) {`
`1730`		`- auto defaultSetting = DebugManager.flags.DisableStatelessToStatefulOptimization.get();`
`1731`		`-`
	`1728`	`+ DebugManagerStateRestore dbgRestorer;`
`1732`	`1729`	`DebugManager.flags.DisableStatelessToStatefulOptimization.set(false);`
`1733`	`1730`	`std::unique_ptr<MockProgram> program{Program::createBuiltInFromSource<MockProgram>("", pContext, pContext->getDevices(), nullptr)};`
`1734`	`1731`	`auto internalOptions = program->getInternalOptions();`
`@@ -1737,17 +1734,14 @@ TEST_F(ProgramTests, Given32bitSupportWhenProgramIsCreatedThenGreaterThan4gbBuff`
`1737`	`1734`	`} else {`
`1738`	`1735`	`EXPECT_TRUE(CompilerOptions::contains(internalOptions, NEO::CompilerOptions::greaterThan4gbBuffersRequired)) << internalOptions;`
`1739`	`1736`	`}`
`1740`		`- DebugManager.flags.DisableStatelessToStatefulOptimization.set(defaultSetting);`
`1741`	`1737`	`}`
`1742`	`1738`
`1743`	`1739`	`TEST_F(ProgramTests, GivenStatelessToStatefulIsDisabledWhenProgramIsCreatedThenGreaterThan4gbBuffersRequiredIsCorrectlySet) {`
`1744`		`- auto defaultSetting = DebugManager.flags.DisableStatelessToStatefulOptimization.get();`
`1745`		`-`
	`1740`	`+ DebugManagerStateRestore dbgRestorer;`
`1746`	`1741`	`DebugManager.flags.DisableStatelessToStatefulOptimization.set(true);`
`1747`	`1742`	`std::unique_ptr<MockProgram> program{Program::createBuiltInFromSource<MockProgram>("", pContext, pContext->getDevices(), nullptr)};`
`1748`	`1743`	`auto internalOptions = program->getInternalOptions();`
`1749`	`1744`	`EXPECT_TRUE(CompilerOptions::contains(internalOptions, NEO::CompilerOptions::greaterThan4gbBuffersRequired)) << internalOptions;`
`1750`		`- DebugManager.flags.DisableStatelessToStatefulOptimization.set(defaultSetting);`
`1751`	`1745`	`}`
`1752`	`1746`
`1753`	`1747`	`TEST_F(ProgramTests, givenProgramWhenItIsCompiledThenItAlwaysHavePreserveVec3TypeInternalOptionSet) {`
`@@ -1757,8 +1751,7 @@ TEST_F(ProgramTests, givenProgramWhenItIsCompiledThenItAlwaysHavePreserveVec3Typ`
`1757`	`1751`	`}`
`1758`	`1752`
`1759`	`1753`	`TEST_F(ProgramTests, Force32BitAddressessWhenProgramIsCreatedThenGreaterThan4gbBuffersRequiredIsCorrectlySet) {`
`1760`		`- auto defaultSetting = DebugManager.flags.DisableStatelessToStatefulOptimization.get();`
`1761`		`-`
	`1754`	`+ DebugManagerStateRestore dbgRestorer;`
`1762`	`1755`	`DebugManager.flags.DisableStatelessToStatefulOptimization.set(false);`
`1763`	`1756`	`const_cast<DeviceInfo *>(&pDevice->getDeviceInfo())->force32BitAddressess = true;`
`1764`	`1757`	`std::unique_ptr<MockProgram> program{Program::createBuiltInFromSource<MockProgram>("", pContext, pContext->getDevices(), nullptr)};`
`@@ -1772,7 +1765,6 @@ TEST_F(ProgramTests, Force32BitAddressessWhenProgramIsCreatedThenGreaterThan4gbB`
`1772`	`1765`	`EXPECT_TRUE(CompilerOptions::contains(internalOptions, NEO::CompilerOptions::greaterThan4gbBuffersRequired)) << internalOptions;`
`1773`	`1766`	`}`
`1774`	`1767`	`}`
`1775`		`- DebugManager.flags.DisableStatelessToStatefulOptimization.set(defaultSetting);`
`1776`	`1768`	`}`
`1777`	`1769`
`1778`	`1770`	`TEST_F(ProgramTests, GivenStatelessToStatefulBufferOffsetOptimizationWhenProgramIsCreatedThenBufferOffsetArgIsSet) {`