Merge branch 'google:main' into model-runtime-annotations

google · Dec 22, 2023 · 89ba1cf · 89ba1cf
2 parents 8cb7bb1 + 2b8a8f0
commit 89ba1cf
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,6 @@
 /requirements.txt
 
 /compile_commands.json
+
+# Editor temporary files
+*.swp
diff --git a/gematria/llvm/asm_parser_test.cc b/gematria/llvm/asm_parser_test.cc
@@ -25,10 +25,10 @@
 #include "gematria/testing/matchers.h"
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-#include "llvm/IR/InlineAsm.h"
-#include "llvm/MC/MCInst.h"
 #include "lib/Target/X86/MCTargetDesc/X86BaseInfo.h"  //// IWYU pragma: keep (for opcodes).
 #include "lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h"
+#include "llvm/IR/InlineAsm.h"
+#include "llvm/MC/MCInst.h"
 
 namespace gematria {
 namespace {

diff --git a/gematria/testing/llvm_test.cc b/gematria/testing/llvm_test.cc
@@ -16,9 +16,9 @@
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
+#include "lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h"
 #include "llvm/MC/MCInst.h"
 #include "llvm/MC/MCInstBuilder.h"
-#include "lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h"
 
 namespace gematria {
 namespace {