Update aub/tbx stepping handling

fhazubski-Intel · Compute-Runtime-Automation · commit 7d01074ee42c · 2021-02-15T13:57:39.000+01:00
For the stepping value use hardware value.

Resolves: NEO-5475

Signed-off-by: Filip Hazubski &lt;filip.hazubski@intel.com&gt;
diff --git a/opencl/source/command_stream/aub_command_stream_receiver_hw_base.inl b/opencl/source/command_stream/aub_command_stream_receiver_hw_base.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2020 Intel Corporation
+ * Copyright (C) 2019-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -146,7 +146,9 @@ void AUBCommandStreamReceiverHw<GfxFamily>::initFile(const std::string &fileName
             UNRECOVERABLE_IF(true);
         }
         // Add the file header
-        stream->init(AubMemDump::SteppingValues::A, aubDeviceId);
+        auto &hwInfo = this->peekHwInfo();
+        auto &hwHelper = NEO::HwHelper::get(hwInfo.platform.eRenderCoreFamily);
+        stream->init(hwHelper.getAubStreamSteppingFromHwRevId(hwInfo), aubDeviceId);
     }
 }
 
diff --git a/opencl/source/command_stream/tbx_command_stream_receiver_hw.inl b/opencl/source/command_stream/tbx_command_stream_receiver_hw.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2020 Intel Corporation
+ * Copyright (C) 2017-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -160,11 +160,11 @@ CommandStreamReceiver *TbxCommandStreamReceiverHw<GfxFamily>::create(const std::
                                                                      uint32_t rootDeviceIndex,
                                                                      const DeviceBitfield deviceBitfield) {
     TbxCommandStreamReceiverHw<GfxFamily> *csr;
+    auto &hwInfo = *(executionEnvironment.rootDeviceEnvironments[rootDeviceIndex]->getHardwareInfo());
+    auto &hwHelper = HwHelper::get(hwInfo.platform.eRenderCoreFamily);
     if (withAubDump) {
-        auto hwInfo = executionEnvironment.rootDeviceEnvironments[rootDeviceIndex]->getHardwareInfo();
-        auto &hwHelper = HwHelper::get(hwInfo->platform.eRenderCoreFamily);
-        auto localMemoryEnabled = hwHelper.getEnableLocalMemory(*hwInfo);
-        auto fullName = AUBCommandStreamReceiver::createFullFilePath(*hwInfo, baseName);
+        auto localMemoryEnabled = hwHelper.getEnableLocalMemory(hwInfo);
+        auto fullName = AUBCommandStreamReceiver::createFullFilePath(hwInfo, baseName);
         if (DebugManager.flags.AUBDumpCaptureFileName.get() != "unk") {
             fullName.assign(DebugManager.flags.AUBDumpCaptureFileName.get());
         }
@@ -197,7 +197,7 @@ CommandStreamReceiver *TbxCommandStreamReceiverHw<GfxFamily>::create(const std::
         csr->stream->open(nullptr);
 
         // Add the file header.
-        bool streamInitialized = csr->stream->init(AubMemDump::SteppingValues::A, csr->aubDeviceId);
+        bool streamInitialized = csr->stream->init(hwHelper.getAubStreamSteppingFromHwRevId(hwInfo), csr->aubDeviceId);
         csr->streamInitialized = streamInitialized;
     }
     return csr;
diff --git a/opencl/test/unit_test/aub/aub_center_tests.cpp b/opencl/test/unit_test/aub/aub_center_tests.cpp
@@ -7,10 +7,12 @@
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/helpers/basic_math.h"
+#include "shared/source/helpers/hw_helper.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/test/common/helpers/debug_manager_state_restore.h"
 #include "shared/test/common/helpers/default_hw_info.h"
 
+#include "opencl/test/unit_test/helpers/hw_helper_tests.h"
 #include "opencl/test/unit_test/mocks/mock_aub_center.h"
 #include "opencl/test/unit_test/mocks/mock_aub_manager.h"
 
@@ -74,6 +76,24 @@ TEST(AubCenter, GivenCsrHwAndNotEmptyAubFileNameWhenGettingAubStreamModeThenMode
     EXPECT_EQ(aub_stream::mode::aubFile, mode);
 }
 
+TEST(AubCenter, WhenAubManagerIsCreatedThenCorrectSteppingIsSet) {
+    DebugManagerStateRestore restorer;
+    DebugManager.flags.UseAubStream.set(true);
+
+    auto hwInfo = *defaultHwInfo;
+    auto &hwHelper = HwHelper::get(hwInfo.platform.eRenderCoreFamily);
+    for (auto steppingPair : steppingPairsToTest) {
+        auto hwRevId = hwHelper.getHwRevIdFromStepping(steppingPair.stepping, hwInfo);
+        if (hwRevId == CommonConstants::invalidStepping) {
+            continue;
+        }
+
+        hwInfo.platform.usRevId = hwRevId;
+        MockAubCenter aubCenter(&hwInfo, false, "", CommandStreamReceiverType::CSR_AUB);
+        EXPECT_EQ(steppingPair.aubStreamStepping, aubCenter.stepping);
+    }
+}
+
 TEST(AubCenter, GivenCsrTypeWhenGettingAubStreamModeThenCorrectModeIsReturned) {
     DebugManagerStateRestore restorer;
     DebugManager.flags.UseAubStream.set(true);
diff --git a/opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.h b/opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2020 Intel Corporation
+ * Copyright (C) 2017-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -40,8 +40,10 @@ void setupAUB(const NEO::Device *pDevice, aub_stream::EngineType engineType) {
     aubFile.fileHandle.open(filePath.c_str(), std::ofstream::binary);
 
     // Header
-    auto deviceId = pDevice->getHardwareInfo().capabilityTable.aubDeviceId;
-    aubFile.init(AubMemDump::SteppingValues::A, deviceId);
+    auto &hwInfo = pDevice->getHardwareInfo();
+    auto deviceId = hwInfo.capabilityTable.aubDeviceId;
+    auto &hwHelper = NEO::HwHelper::get(hwInfo.platform.eRenderCoreFamily);
+    aubFile.init(hwHelper.getAubStreamSteppingFromHwRevId(hwInfo), deviceId);
 
     aubFile.writeMMIO(mmioBase + 0x229c, 0xffff8280);
 
diff --git a/opencl/test/unit_test/aub_tests/gen11/batch_buffer/aub_batch_buffer_tests_gen11.h b/opencl/test/unit_test/aub_tests/gen11/batch_buffer/aub_batch_buffer_tests_gen11.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2020 Intel Corporation
+ * Copyright (C) 2018-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -29,7 +29,9 @@ void setupAUBWithBatchBuffer(const NEO::Device *pDevice, aub_stream::EngineType
     aubFile.fileHandle.open(filePath.c_str(), std::ofstream::binary);
 
     // Header
-    aubFile.init(AubMemDump::SteppingValues::A, AUB::Traits::device);
+    auto &hwInfo = pDevice->getHardwareInfo();
+    auto &hwHelper = NEO::HwHelper::get(hwInfo.platform.eRenderCoreFamily);
+    aubFile.init(hwHelper.getAubStreamSteppingFromHwRevId(hwInfo), AUB::Traits::device);
 
     aubFile.writeMMIO(AubMemDump::computeRegisterOffset(mmioBase, 0x229c), 0xffff8280);
 
diff --git a/opencl/test/unit_test/aub_tests/gen12lp/batch_buffer/aub_batch_buffer_tests_gen12lp.h b/opencl/test/unit_test/aub_tests/gen12lp/batch_buffer/aub_batch_buffer_tests_gen12lp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2020 Intel Corporation
+ * Copyright (C) 2019-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -29,7 +29,9 @@ void setupAUBWithBatchBuffer(const NEO::Device *pDevice, aub_stream::EngineType
     aubFile.fileHandle.open(filePath.c_str(), std::ofstream::binary);
 
     // Header
-    aubFile.init(AubMemDump::SteppingValues::A, AUB::Traits::device);
+    auto &hwInfo = pDevice->getHardwareInfo();
+    auto &hwHelper = NEO::HwHelper::get(hwInfo.platform.eRenderCoreFamily);
+    aubFile.init(hwHelper.getAubStreamSteppingFromHwRevId(hwInfo), AUB::Traits::device);
 
     aubFile.writeMMIO(AubMemDump::computeRegisterOffset(mmioBase, 0x229c), 0xffff8280);
 
diff --git a/opencl/test/unit_test/aub_tests/gen9/batch_buffer/aub_batch_buffer_tests.h b/opencl/test/unit_test/aub_tests/gen9/batch_buffer/aub_batch_buffer_tests.h
@@ -1,12 +1,13 @@
 /*
- * Copyright (C) 2018-2020 Intel Corporation
+ * Copyright (C) 2018-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
 #include "shared/source/aub/aub_helper.h"
+#include "shared/source/helpers/hw_helper.h"
 
 #include "opencl/test/unit_test/aub_tests/command_stream/aub_mem_dump_tests.h"
 
@@ -29,8 +30,10 @@ void setupAUBWithBatchBuffer(const NEO::Device *pDevice, aub_stream::EngineType
     aubFile.fileHandle.open(filePath.c_str(), std::ofstream::binary);
 
     // Header
-    auto deviceId = pDevice->getHardwareInfo().capabilityTable.aubDeviceId;
-    aubFile.init(AubMemDump::SteppingValues::A, deviceId);
+    auto &hwInfo = pDevice->getHardwareInfo();
+    auto deviceId = hwInfo.capabilityTable.aubDeviceId;
+    auto &hwHelper = NEO::HwHelper::get(hwInfo.platform.eRenderCoreFamily);
+    aubFile.init(hwHelper.getAubStreamSteppingFromHwRevId(hwInfo), deviceId);
 
     aubFile.writeMMIO(AubMemDump::computeRegisterOffset(mmioBase, 0x229c), 0xffff8280);
 
diff --git a/opencl/test/unit_test/helpers/hw_helper_tests.cpp b/opencl/test/unit_test/helpers/hw_helper_tests.cpp
@@ -875,11 +875,23 @@ HWTEST_F(HwHelperTest, givenVariousValuesWhenConvertingHwRevIdAndSteppingThenCon
     for (uint32_t testValue = 0; testValue < 0x10; testValue++) {
         auto hwRevIdFromStepping = helper.getHwRevIdFromStepping(testValue, hardwareInfo);
         if (hwRevIdFromStepping != CommonConstants::invalidStepping) {
-            EXPECT_EQ(testValue, helper.getSteppingFromHwRevId(hwRevIdFromStepping, hardwareInfo));
+            hardwareInfo.platform.usRevId = hwRevIdFromStepping;
+            EXPECT_EQ(testValue, helper.getSteppingFromHwRevId(hardwareInfo));
         }
-        auto steppingFromHwRevId = helper.getSteppingFromHwRevId(testValue, hardwareInfo);
+        hardwareInfo.platform.usRevId = testValue;
+        auto steppingFromHwRevId = helper.getSteppingFromHwRevId(hardwareInfo);
         if (steppingFromHwRevId != CommonConstants::invalidStepping) {
             EXPECT_EQ(testValue, helper.getHwRevIdFromStepping(steppingFromHwRevId, hardwareInfo));
+        } else {
+            EXPECT_EQ(AubMemDump::SteppingValues::A, helper.getAubStreamSteppingFromHwRevId(hardwareInfo));
+        }
+    }
+
+    for (auto &steppingPair : steppingPairsToTest) {
+        auto hwRevIdFromStepping = helper.getHwRevIdFromStepping(steppingPair.stepping, hardwareInfo);
+        if (hwRevIdFromStepping != CommonConstants::invalidStepping) {
+            hardwareInfo.platform.usRevId = hwRevIdFromStepping;
+            EXPECT_EQ(steppingPair.aubStreamStepping, helper.getAubStreamSteppingFromHwRevId(hardwareInfo));
         }
     }
 }
@@ -889,7 +901,9 @@ HWTEST_F(HwHelperTest, givenInvalidProductFamilyWhenConvertingHwRevIdAndStepping
     hardwareInfo.platform.eProductFamily = IGFX_UNKNOWN;
     for (uint32_t testValue = 0; testValue < 0x10; testValue++) {
         EXPECT_EQ(CommonConstants::invalidStepping, helper.getHwRevIdFromStepping(testValue, hardwareInfo));
-        EXPECT_EQ(CommonConstants::invalidStepping, helper.getSteppingFromHwRevId(testValue, hardwareInfo));
+        hardwareInfo.platform.usRevId = testValue;
+        EXPECT_EQ(CommonConstants::invalidStepping, helper.getSteppingFromHwRevId(hardwareInfo));
+        EXPECT_EQ(AubMemDump::SteppingValues::A, helper.getAubStreamSteppingFromHwRevId(hardwareInfo));
     }
 }
 
diff --git a/opencl/test/unit_test/helpers/hw_helper_tests.h b/opencl/test/unit_test/helpers/hw_helper_tests.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017-2020 Intel Corporation
+ * Copyright (C) 2017-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -18,3 +18,15 @@ using namespace NEO;
 using HwHelperTest = Test<ClDeviceFixture>;
 
 void testDefaultImplementationOfSetupHardwareCapabilities(HwHelper &hwHelper, const HardwareInfo &hwInfo);
+
+constexpr struct {
+    __REVID stepping;
+    uint32_t aubStreamStepping;
+} steppingPairsToTest[] = {
+    {REVISION_A0, AubMemDump::SteppingValues::A},
+    {REVISION_A1, AubMemDump::SteppingValues::A},
+    {REVISION_A3, AubMemDump::SteppingValues::A},
+    {REVISION_B, AubMemDump::SteppingValues::B},
+    {REVISION_C, AubMemDump::SteppingValues::C},
+    {REVISION_D, AubMemDump::SteppingValues::D},
+    {REVISION_K, AubMemDump::SteppingValues::K}};
diff --git a/opencl/test/unit_test/mocks/mock_aub_center.h b/opencl/test/unit_test/mocks/mock_aub_center.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2020 Intel Corporation
+ * Copyright (C) 2018-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -28,6 +28,7 @@ class MockAubCenter : public AubCenter {
     using AubCenter::AubCenter;
     using AubCenter::aubManager;
     using AubCenter::aubStreamMode;
+    using AubCenter::stepping;
 
     MockAubCenter() {
         streamProvider.reset(new MockAubStreamProvider());
diff --git a/shared/source/aub/aub_center.cpp b/shared/source/aub/aub_center.cpp
@@ -30,6 +30,7 @@ AubCenter::AubCenter(const HardwareInfo *pHwInfo, bool localMemoryEnabled, const
         aubStreamMode = getAubStreamMode(aubFileName, type);
 
         auto &hwHelper = HwHelper::get(pHwInfo->platform.eRenderCoreFamily);
+        stepping = hwHelper.getAubStreamSteppingFromHwRevId(*pHwInfo);
 
         aub_stream::MMIOList extraMmioList = hwHelper.getExtraMmioList(*pHwInfo);
         aub_stream::MMIOList debugMmioList = AubHelper::getAdditionalMmioList();
@@ -40,7 +41,8 @@ AubCenter::AubCenter(const HardwareInfo *pHwInfo, bool localMemoryEnabled, const
 
         AubHelper::setTbxConfiguration();
 
-        aubManager.reset(createAubManager(pHwInfo->platform.eProductFamily, devicesCount, memoryBankSize, pHwInfo->platform.usRevId, localMemoryEnabled, aubStreamMode, pHwInfo->capabilityTable.gpuAddressSpace));
+        aubManager.reset(createAubManager(pHwInfo->platform.eProductFamily, devicesCount, memoryBankSize, stepping, localMemoryEnabled,
+                                          aubStreamMode, pHwInfo->capabilityTable.gpuAddressSpace));
     }
     addressMapper = std::make_unique<AddressMapper>();
     streamProvider = std::make_unique<AubFileStreamProvider>();
diff --git a/shared/source/aub/aub_center.h b/shared/source/aub/aub_center.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2020 Intel Corporation
+ * Copyright (C) 2018-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -58,5 +58,6 @@ class AubCenter {
     std::unique_ptr<AubSubCaptureCommon> subCaptureCommon;
     std::unique_ptr<aub_stream::AubManager> aubManager;
     uint32_t aubStreamMode = 0;
+    uint32_t stepping = 0;
 };
 } // namespace NEO
diff --git a/shared/source/gen12lp/helpers_gen12lp.cpp b/shared/source/gen12lp/helpers_gen12lp.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2020 Intel Corporation
+ * Copyright (C) 2019-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -23,10 +23,14 @@ uint32_t getHwRevIdFromStepping(uint32_t stepping, const HardwareInfo &hwInfo) {
     return CommonConstants::invalidStepping;
 }
 
-uint32_t getSteppingFromHwRevId(uint32_t hwRevId, const HardwareInfo &hwInfo) {
+uint32_t getSteppingFromHwRevId(const HardwareInfo &hwInfo) {
     return CommonConstants::invalidStepping;
 }
 
+uint32_t getAubStreamSteppingFromHwRevId(const HardwareInfo &hwInfo) {
+    return AubMemDump::SteppingValues::A;
+}
+
 bool imagePitchAlignmentWaRequired(PRODUCT_FAMILY productFamily) {
     return (productFamily == PRODUCT_FAMILY::IGFX_TIGERLAKE_LP);
 }
diff --git a/shared/source/gen12lp/helpers_gen12lp.h b/shared/source/gen12lp/helpers_gen12lp.h
@@ -25,7 +25,8 @@ enum class LocalMemoryAccessMode;
 namespace Gen12LPHelpers {
 bool pipeControlWaRequired(PRODUCT_FAMILY productFamily);
 uint32_t getHwRevIdFromStepping(uint32_t stepping, const HardwareInfo &hwInfo);
-uint32_t getSteppingFromHwRevId(uint32_t hwRevId, const HardwareInfo &hwInfo);
+uint32_t getSteppingFromHwRevId(const HardwareInfo &hwInfo);
+uint32_t getAubStreamSteppingFromHwRevId(const HardwareInfo &hwInfo);
 bool imagePitchAlignmentWaRequired(PRODUCT_FAMILY productFamily);
 void adjustCoherencyFlag(PRODUCT_FAMILY productFamily, bool &coherencyFlag);
 bool isLocalMemoryEnabled(const HardwareInfo &hwInfo);
diff --git a/shared/source/gen12lp/helpers_gen12lp_dg1.cpp b/shared/source/gen12lp/helpers_gen12lp_dg1.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 Intel Corporation
+ * Copyright (C) 2020-2021 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -31,9 +31,9 @@ uint32_t getHwRevIdFromStepping(uint32_t stepping, const HardwareInfo &hwInfo) {
     return CommonConstants::invalidStepping;
 }
 
-uint32_t getSteppingFromHwRevId(uint32_t hwRevId, const HardwareInfo &hwInfo) {
+uint32_t getSteppingFromHwRevId(const HardwareInfo &hwInfo) {
     if (hwInfo.platform.eProductFamily == PRODUCT_FAMILY::IGFX_DG1) {
-        switch (hwRevId) {
+        switch (hwInfo.platform.usRevId) {
         case 0x0:
             return REVISION_A0;
         case 0x1:
@@ -43,6 +43,18 @@ uint32_t getSteppingFromHwRevId(uint32_t hwRevId, const HardwareInfo &hwInfo) {
     return CommonConstants::invalidStepping;
 }
 
+uint32_t getAubStreamSteppingFromHwRevId(const HardwareInfo &hwInfo) {
+    if (hwInfo.platform.eProductFamily == PRODUCT_FAMILY::IGFX_DG1) {
+        switch (hwInfo.platform.usRevId) {
+        case 0x0:
+            return AubMemDump::SteppingValues::A;
+        case 0x1:
+            return AubMemDump::SteppingValues::B;
+        }
+    }
+    return AubMemDump::SteppingValues::A;
+}
+
 bool imagePitchAlignmentWaRequired(PRODUCT_FAMILY productFamily) {
     return (productFamily == IGFX_TIGERLAKE_LP) || (productFamily == IGFX_DG1);
 }
diff --git a/shared/source/gen12lp/hw_helper_gen12lp.cpp b/shared/source/gen12lp/hw_helper_gen12lp.cpp
diff --git a/shared/source/helpers/hw_helper.h b/shared/source/helpers/hw_helper.h
diff --git a/shared/source/helpers/hw_helper_base.inl b/shared/source/helpers/hw_helper_base.inl

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (C) 2019-2020 Intel Corporation`
	`2`	`+ * Copyright (C) 2019-2021 Intel Corporation`
`3`	`3`	`*`
`4`	`4`	`* SPDX-License-Identifier: MIT`
`5`	`5`	`*`
`@@ -146,7 +146,9 @@ void AUBCommandStreamReceiverHw<GfxFamily>::initFile(const std::string &fileName`
`146`	`146`	`UNRECOVERABLE_IF(true);`
`147`	`147`	`}`
`148`	`148`	`// Add the file header`
`149`		`- stream->init(AubMemDump::SteppingValues::A, aubDeviceId);`
	`149`	`+ auto &hwInfo = this->peekHwInfo();`
	`150`	`+ auto &hwHelper = NEO::HwHelper::get(hwInfo.platform.eRenderCoreFamily);`
	`151`	`+ stream->init(hwHelper.getAubStreamSteppingFromHwRevId(hwInfo), aubDeviceId);`
`150`	`152`	`}`
`151`	`153`	`}`
`152`	`154`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (C) 2018-2020 Intel Corporation`
	`2`	`+ * Copyright (C) 2018-2021 Intel Corporation`
`3`	`3`	`*`
`4`	`4`	`* SPDX-License-Identifier: MIT`
`5`	`5`	`*`
`@@ -29,7 +29,9 @@ void setupAUBWithBatchBuffer(const NEO::Device *pDevice, aub_stream::EngineType`
`29`	`29`	`aubFile.fileHandle.open(filePath.c_str(), std::ofstream::binary);`
`30`	`30`
`31`	`31`	`// Header`
`32`		`- aubFile.init(AubMemDump::SteppingValues::A, AUB::Traits::device);`
	`32`	`+ auto &hwInfo = pDevice->getHardwareInfo();`
	`33`	`+ auto &hwHelper = NEO::HwHelper::get(hwInfo.platform.eRenderCoreFamily);`
	`34`	`+ aubFile.init(hwHelper.getAubStreamSteppingFromHwRevId(hwInfo), AUB::Traits::device);`
`33`	`35`
`34`	`36`	`aubFile.writeMMIO(AubMemDump::computeRegisterOffset(mmioBase, 0x229c), 0xffff8280);`
`35`	`37`