Merge branch 'main' into export-D82560656

Author: Polyomino

examples/arm/aot_arm_compiler.py

@@ -297,6 +297,19 @@ def forward(self, x: torch.Tensor, y: torch.Tensor):
     can_delegate = True
 
 
+class QuantLinearTest(torch.nn.Module):
+    def __init__(self):
+        super().__init__()
+        # Define a simple linear layer
+        self.linear = torch.nn.Linear(61, 37)
+
+    def forward(self, x):
+        return self.linear(x)
+
+    example_input = (torch.randn([8, 61], dtype=torch.float32),)
+    can_delegate = True
+
+
 models = {
     "add": AddModule,
     "add2": AddModule2,
@@ -306,6 +319,9 @@ def forward(self, x: torch.Tensor, y: torch.Tensor):
     "qops": QuantOpTest,
     "softmax": SoftmaxModule,
     "MultipleOutputsModule": MultipleOutputsModule,
+    # TODO: Remove this from here, once we have dedicated MCU test pipeline ready. This is an interim solution.
+    # See https://github.com/pytorch/executorch/discussions/13944
+    "qlinear": QuantLinearTest,
 }
 
 calibration_data = {
@@ -330,6 +346,7 @@ def forward(self, x: torch.Tensor, y: torch.Tensor):
         torch.randn(32, 2, 1) * 1000,
     ),
     "softmax": (torch.randn(32, 2, 2),),
+    "qlinear": (torch.randn(37, 61),),
 }
 
 evaluators = {

examples/arm/run_mcu_models_fvp.sh

@@ -24,9 +24,9 @@ VALID_TARGETS=(
 )
 
 # Default models for MCU validation with portable kernels
-DEFAULT_MODELS=(mv2 mv3 lstm)
+DEFAULT_MODELS=(mv2 mv3 lstm qadd qlinear)
 # Available models (on FVP)
-AVAILABLE_MODELS=(mv2 mv3 lstm)
+AVAILABLE_MODELS=(mv2 mv3 lstm qadd qlinear)
 # Add the following models if you want to enable them later (atm they are not working on FVP)
 # edsr w2l ic3 ic4 resnet18 resnet50
 
@@ -257,6 +257,7 @@ for model in "${MODELS[@]}"; do
         -m "$model" \
         --target="$ETHOS_TARGET" \
         --quantize \
+        --enable_qdq_fusion_pass \
         --output="arm_test/$model"; then
         echo "❌ AOT compilation failed for $model"
         MODEL_SUCCESS=false

runtime/platform/test/CMakeLists.txt

@@ -33,8 +33,9 @@ et_cxx_test(
 #
 # et_cxx_test(platform_death_test SOURCES executor_pal_death_test.cpp)
 
-# No weak function symbols Windows/MSVC, thus PAL intercept is not supported.
-if(NOT WIN32)
+# No weak function symbols on Windows/MSVC, thus PAL intercept doesn't work.
+# Skip logging tests in Release mode.
+if(NOT WIN32 AND NOT CMAKE_BUILD_TYPE STREQUAL "Release")
   et_cxx_test(logging_test SOURCES logging_test.cpp stub_platform.cpp)
   set_source_files_properties(
     logging_test.cpp PROPERTIES COMPILE_DEFINITIONS "ET_MIN_LOG_LEVEL=Debug"