Skip to content

Removing AMX build flag #16086

Merged
chenfucn merged 21 commits into
microsoft:mainfrom
dipanjans12:amx-dsengupt
Jun 15, 2023
Merged

Removing AMX build flag #16086
chenfucn merged 21 commits into
microsoft:mainfrom
dipanjans12:amx-dsengupt

Conversation

@dipanjans12
Copy link
Copy Markdown
Contributor

@dipanjans12 dipanjans12 commented May 24, 2023

Description

  1. Replacing AMX intrinsics with machine code macro instructions in QGEMM kernel.
  2. Removing AMX build flags for GCC in cmake file.

Motivation and Context

The additional AMX flag in cmake adds an extra layer of dependency on GCC version to use the feature.These changes should allow the usage of the AMX feature with just the CPU ID check.

@dipanjans12 dipanjans12 requested a review from a team as a code owner May 24, 2023 23:03
Comment thread cmake/onnxruntime_mlas.cmake Outdated
Comment thread onnxruntime/core/mlas/lib/amx_common.h
chenfucn
chenfucn previously approved these changes May 26, 2023
@chenfucn
Copy link
Copy Markdown
Contributor

/azp run Linux CPU CI Pipeline, Linux CPU Minimal Build E2E CI Pipeline, Linux GPU CI Pipeline, Linux GPU TensorRT CI Pipeline, Linux OpenVINO CI Pipeline, Linux QNN CI Pipeline, MacOS CI Pipeline

@chenfucn
Copy link
Copy Markdown
Contributor

/azp run ONNX Runtime Web CI Pipeline, Windows ARM64 QNN CI Pipeline, Windows CPU CI Pipeline, Windows GPU CI Pipeline, Windows GPU TensorRT CI Pipeline, onnxruntime-binary-size-checks-ci-pipeline, orttraining-linux-ci-pipeline, orttraining-linux-gpu-ci-pipeline, orttraining-ortmodule-distributed

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 7 pipeline(s).

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 9 pipeline(s).

@chenfucn
Copy link
Copy Markdown
Contributor

/azp run ONNX Runtime Web CI Pipeline, Windows ARM64 QNN CI Pipeline, Windows CPU CI Pipeline, Windows GPU CI Pipeline, Windows GPU TensorRT CI Pipeline, onnxruntime-binary-size-checks-ci-pipeline, orttraining-linux-ci-pipeline, orttraining-linux-gpu-ci-pipeline, orttraining-ortmodule-distributed

@chenfucn
Copy link
Copy Markdown
Contributor

/azp run Linux CPU CI Pipeline, Linux CPU Minimal Build E2E CI Pipeline, Linux GPU CI Pipeline, Linux GPU TensorRT CI Pipeline, Linux OpenVINO CI Pipeline, Linux QNN CI Pipeline, MacOS CI Pipeline

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 9 pipeline(s).

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 7 pipeline(s).

@chenfucn
Copy link
Copy Markdown
Contributor

/azp run ONNX Runtime Web CI Pipeline, Windows ARM64 QNN CI Pipeline, Windows CPU CI Pipeline, Windows GPU CI Pipeline, Windows GPU TensorRT CI Pipeline, onnxruntime-binary-size-checks-ci-pipeline, orttraining-linux-ci-pipeline, orttraining-linux-gpu-ci-pipeline, orttraining-ortmodule-distributed

@chenfucn
Copy link
Copy Markdown
Contributor

/azp run Linux CPU CI Pipeline, Linux CPU Minimal Build E2E CI Pipeline, Linux GPU CI Pipeline, Linux GPU TensorRT CI Pipeline, Linux OpenVINO CI Pipeline, Linux QNN CI Pipeline, MacOS CI Pipeline

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 9 pipeline(s).

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 7 pipeline(s).

@yihonglyu
Copy link
Copy Markdown
Contributor

Please fix successful checks for merge

Comment thread onnxruntime/core/mlas/lib/amx_common.h Outdated
@chenfucn
Copy link
Copy Markdown
Contributor

/azp run ONNX Runtime Web CI Pipeline, Windows ARM64 QNN CI Pipeline, Windows CPU CI Pipeline, Windows GPU CI Pipeline, Windows GPU TensorRT CI Pipeline, onnxruntime-binary-size-checks-ci-pipeline, orttraining-linux-ci-pipeline, orttraining-linux-gpu-ci-pipeline, orttraining-ortmodule-distributed

@chenfucn
Copy link
Copy Markdown
Contributor

/azp run Linux CPU CI Pipeline, Linux CPU Minimal Build E2E CI Pipeline, Linux GPU CI Pipeline, Linux GPU TensorRT CI Pipeline, Linux OpenVINO CI Pipeline, Linux QNN CI Pipeline, MacOS CI Pipeline

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 9 pipeline(s).

@azure-pipelines
Copy link
Copy Markdown

Azure Pipelines successfully started running 7 pipeline(s).

@chenfucn chenfucn merged commit 681a0d0 into microsoft:main Jun 15, 2023
mszhanyi added a commit that referenced this pull request Jun 16, 2023
chenfucn added a commit that referenced this pull request Jun 22, 2023
@chenfucn chenfucn mentioned this pull request Jun 22, 2023
chenfucn added a commit that referenced this pull request Jun 23, 2023
### Description

This is to revert two PRs that aim at reducing AMX toolchain
requirements. Unfortunately we still have some pipeline issues.

#16390
#16086

### Motivation and Context

Looks like gcc link time optimization does not work very well with
inline assembly in the above PRs.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants