Add as/dis support for Arm.MotionEngine.100 extended instruction set (KhronosGroup#6284)

Change-Id: I9971a0c3f7edbdbd9be9ecab25797f0ee67cf720

---------

Signed-off-by: Kevin Petit <[email protected]>

Author: kpet

BUILD.bazel

@@ -53,6 +53,7 @@ create_grammar_tables_target(
         ExtInst("opencl.debuginfo.100", prefix="CLDEBUG100_"),
         ExtInst("nonsemantic.shader.debuginfo.100", prefix="SHDEBUG100_"),
         ExtInst("tosa.001000.1", target="spirv_ext_inst_tosa_001000_1", prefix="TOSA_"),
+        ExtInst("arm.motion-engine.100", target="spirv_ext_inst_arm_motion_engine_100"),
     ] + [ExtInst(e) for e in [
             "spv-amd-shader-explicit-vertex-parameter",
             "spv-amd-shader-trinary-minmax",

include/spirv-tools/libspirv.h

@@ -364,6 +364,7 @@ typedef enum spv_ext_inst_type_t {
   SPV_EXT_INST_TYPE_NONSEMANTIC_SHADER_DEBUGINFO_100,
   SPV_EXT_INST_TYPE_NONSEMANTIC_VKSPREFLECTION,
   SPV_EXT_INST_TYPE_TOSA_001000_1,
+  SPV_EXT_INST_TYPE_ARM_MOTION_ENGINE_100,
 
   // Multiple distinct extended instruction set types could return this
   // value, if they are prefixed with NonSemantic. and are otherwise

source/CMakeLists.txt

@@ -32,6 +32,7 @@ set(EI_ns_debuginfo "${GRAMMAR_DIR}/extinst.nonsemantic.shader.debuginfo.100.gra
 set(EI_ns_clspvreflect "${GRAMMAR_DIR}/extinst.nonsemantic.clspvreflection.grammar.json")
 set(EI_ns_vkspreflect "${GRAMMAR_DIR}/extinst.nonsemantic.vkspreflection.grammar.json")
 set(EI_tosa_001000_1 "${GRAMMAR_DIR}/extinst.tosa.001000.1.grammar.json")
+set(EI_arm_motion_engine_100 "${GRAMMAR_DIR}/extinst.arm.motion-engine.100.grammar.json")
 
 set(CORE_TABLES_BODY_INC_FILE ${spirv-tools_BINARY_DIR}/core_tables_body.inc)
 set(CORE_TABLES_HEADER_INC_FILE ${spirv-tools_BINARY_DIR}/core_tables_header.inc)
@@ -52,6 +53,7 @@ add_custom_command(OUTPUT ${CORE_TABLES_BODY_INC_FILE} ${CORE_TABLES_HEADER_INC_
       --extinst=,${EI_ns_clspvreflect}
       --extinst=,${EI_ns_vkspreflect}
       --extinst=TOSA_,${EI_tosa_001000_1}
+      --extinst=,${EI_arm_motion_engine_100}
     DEPENDS ${GGT_SCRIPT}
             ${SPIRV_CORE_GRAMMAR_JSON_FILE}
 	    ${EI_glsl}
@@ -65,7 +67,8 @@ add_custom_command(OUTPUT ${CORE_TABLES_BODY_INC_FILE} ${CORE_TABLES_HEADER_INC_
 	    ${EI_debuginfo}
 	    ${EI_ns_clspvreflect}
 	    ${EI_ns_vkspreflect}
-            ${EI_tosa_001000_1}
+	    ${EI_tosa_001000_1}
+	    ${EI_arm_motion_engine_100}
     COMMENT "Generate grammar tables")
 add_custom_target(spirv-tools-tables DEPENDS ${CORE_TABLES_BODY_INC_FILE} ${CORE_TABLES_HEADER_INC_FILE})
 

source/ext_inst.cpp

@@ -58,6 +58,9 @@ spv_ext_inst_type_t spvExtInstImportTypeGet(const char* name) {
   if (!strcmp("TOSA.001000.1", name)) {
     return SPV_EXT_INST_TYPE_TOSA_001000_1;
   }
+  if (!strcmp("Arm.MotionEngine.100", name)) {
+    return SPV_EXT_INST_TYPE_ARM_MOTION_ENGINE_100;
+  }
   // ensure to add any known non-semantic extended instruction sets
   // above this point, and update spvExtInstIsNonSemantic()
   if (!strncmp("NonSemantic.", name, 12)) {

test/CMakeLists.txt

@@ -103,6 +103,7 @@ set(TEST_SOURCES
   diagnostic_test.cpp
   enum_string_mapping_test.cpp
   enum_set_test.cpp
+  ext_inst.arm_motion_engine_test.cpp
   ext_inst.cldebug100_test.cpp
   ext_inst.debuginfo_test.cpp
   ext_inst.glsl_test.cpp

test/ext_inst.arm_motion_engine_test.cpp

@@ -0,0 +1,94 @@
+// Copyright (c) 2024-2025 Arm Ltd.
+//
+// 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.
+
+#include <string>
+
+#include "gmock/gmock.h"
+#include "source/util/string_utils.h"
+#include "spirv/unified1/ArmMotionEngine.100.h"
+#include "test/test_fixture.h"
+#include "test/unit_spirv.h"
+
+namespace spvtools {
+namespace {
+
+using spvtest::Concatenate;
+using spvtest::MakeInstruction;
+using spvtest::TextToBinaryTest;
+using testing::Eq;
+using utils::MakeVector;
+
+TEST_F(TextToBinaryTest, ArmMotionEngineImportTest) {
+  const std::string src = "%1 = OpExtInstImport \"Arm.MotionEngine.100\"";
+  EXPECT_THAT(CompiledInstructions(src),
+              Eq(MakeInstruction(spv::Op::OpExtInstImport, {1},
+                                 MakeVector("Arm.MotionEngine.100"))));
+}
+
+TEST_F(TextToBinaryTest, ArmMotionEngineInstructionMIN_SAD) {
+  const std::string src =
+      "%1 = OpExtInstImport \"Arm.MotionEngine.100\"\n"
+      "%3 = OpExtInst %2 %1 MIN_SAD %4 %5 %6 %7 %8 %9 %10 %11 %12\n";
+
+  // First make sure it assembles correctly.
+  EXPECT_THAT(
+      CompiledInstructions(src),
+      Eq(Concatenate({MakeInstruction(spv::Op::OpExtInstImport, {1},
+                                      MakeVector("Arm.MotionEngine.100")),
+                      MakeInstruction(spv::Op::OpExtInst,
+                                      {2, 3, 1, ArmMotionEngineMIN_SAD, 4, 5, 6,
+                                       7, 8, 9, 10, 11, 12})})))
+      << src;
+  // Now check the round trip through the disassembler.
+  EXPECT_THAT(EncodeAndDecodeSuccessfully(src), src) << src;
+}
+
+TEST_F(TextToBinaryTest, ArmMotionEngineInstructionMIN_SAD_COST) {
+  const std::string src =
+      "%1 = OpExtInstImport \"Arm.MotionEngine.100\"\n"
+      "%3 = OpExtInst %2 %1 MIN_SAD_COST %4 %5 %6 %7 %8 %9 %10 %11 %12\n";
+
+  // First make sure it assembles correctly.
+  EXPECT_THAT(
+      CompiledInstructions(src),
+      Eq(Concatenate({MakeInstruction(spv::Op::OpExtInstImport, {1},
+                                      MakeVector("Arm.MotionEngine.100")),
+                      MakeInstruction(spv::Op::OpExtInst,
+                                      {2, 3, 1, ArmMotionEngineMIN_SAD_COST, 4,
+                                       5, 6, 7, 8, 9, 10, 11, 12})})))
+      << src;
+  // Now check the round trip through the disassembler.
+  EXPECT_THAT(EncodeAndDecodeSuccessfully(src), src) << src;
+}
+
+TEST_F(TextToBinaryTest, ArmMotionEngineInstructionRAW_SAD) {
+  const std::string src =
+      "%1 = OpExtInstImport \"Arm.MotionEngine.100\"\n"
+      "%3 = OpExtInst %2 %1 RAW_SAD %4 %5 %6 %7 %8 %9 %10 %11\n";
+
+  // First make sure it assembles correctly.
+  EXPECT_THAT(
+      CompiledInstructions(src),
+      Eq(Concatenate(
+          {MakeInstruction(spv::Op::OpExtInstImport, {1},
+                           MakeVector("Arm.MotionEngine.100")),
+           MakeInstruction(spv::Op::OpExtInst, {2, 3, 1, ArmMotionEngineRAW_SAD,
+                                                4, 5, 6, 7, 8, 9, 10, 11})})))
+      << src;
+  // Now check the round trip through the disassembler.
+  EXPECT_THAT(EncodeAndDecodeSuccessfully(src), src) << src;
+}
+
+}  // namespace
+}  // namespace spvtools