[OHOS] Add support for OpenHarmony

[kpdev42]

Summary

Add support for OpenHarmony OS

General OpenHarmony OS discussion on discourse thread "[RFC] Add support for OpenHarmony OS"
https://discourse.llvm.org/t/rfc-add-support-for-openharmony-os/66656

[kpdev42]

Remove tls-related changes
Add link to dicourse thread

[kpdev42]

Ping) Any thoughts, questions?

[kpdev42]

Ping

[kpdev42]

ping

[DavidSpickett]

Please include context with the diff (https://llvm.org/docs/Phabricator.html#requesting-a-review-via-the-web-interface).

(Phab doesn't have the full repo backing each diff so the context lets us see what the surrounding code is)

[arsenm]

I'm generally of the opinion that anything and everything can go into Triple

llvm/include/llvm/ADT/Triple.h

742

As someone who's never heard of this operating system, this helper name isn't particularly enlightening

[arsenm]

llvm/test/Transforms/SafeStack/AArch64/unreachable.ll

6

New tests should use opaque pointers (has this one somehow missed conversion?)

[jrtc27]

llvm/include/llvm/ADT/Triple.h

250

Keep blank line

270

Keep blank line

742

What if I give aarch64-liteos-gnu?

llvm/include/llvm/BinaryFormat/MinidumpConstants.def

118

What's with the 0x8206 gap?

llvm/test/Transforms/SafeStack/AArch64/abi.ll

2

These diffs don't belong here, the tests pass without them

[DavidSpickett]

llvm/test/Transforms/SafeStack/AArch64/abi.ll

7

This should have a comment if there is some OpenHarmony specific behaviour here.

llvm/test/Transforms/SafeStack/AArch64/unreachable.ll

6

Same here please note why OpenHarmony needs this specific check. Also note that FileCheck %s --check-prefix=OHOSMUSL will only check that prefix, not that plus the CHECK. I don't know if that is what you intended.

llvm/unittests/ADT/TripleTest.cpp

813

Is the "canonical" triple here arm-unknown-liteos-ohos ? I guess you are testing here to make sure that liteos implies ohos if ohos is not in the triple already.

[kpdev42]

Rebase and clean

[kpdev42]

llvm/include/llvm/ADT/Triple.h

742

We currently assume environment for liteos is always ohos. Thus gnu env will be ignored.

[DavidSpickett]

llvm/include/llvm/BinaryFormat/MinidumpConstants.def

118

Is this still relevant?

[kpdev42]

llvm/include/llvm/BinaryFormat/MinidumpConstants.def

118

Actually, no, it was changed from 0x8207 in initial diff to 0x8206 in current one

[DavidSpickett]

LGTM, all comments have been addressed.

Please add [llvm] at the start of the commit title as well. If you are landing it using arc, edit the title here in the web interface first. It has a habit of choosing that over the local version in my experience.

[kpdev42]

In D138202#4154806, @DavidSpickett wrote:

LGTM, all comments have been addressed.

Please add [llvm] at the start of the commit title as well. If you are landing it using arc, edit the title here in the web interface first. It has a habit of choosing that over the local version in my experience.

Sorry, forgot to add this tag, mea culpa. Will add it in next patches. Thank you for the review

llvm/include/llvm/ADT/Triple.h

     WASI,       // Experimental WebAssembly OS
     Emscripten,
     ShaderModel, // DirectX ShaderModel
-    LastOSType = ShaderModel
+    LiteOS,
+    LastOSType = LiteOS
   };
   enum EnvironmentType {
     UnknownEnvironment,

     CoreCLR,
     Simulator, // Simulator variants of other systems, e.g., Apple's iOS
     MacABI, // Mac Catalyst variant of Apple's iOS deployment target.
-    
     // Shader Stages
     // The order of these values matters, and must be kept in sync with the
     // language options enum in Clang. The ordering is enforced in

     Callable,
     Mesh,
     Amplification,
-
-    LastEnvironmentType = Amplification
+    OpenHOS,
+    LastEnvironmentType = OpenHOS
   };
   enum ObjectFormatType {
     UnknownObjectFormat,

     return getEnvironment() == Triple::Musl ||
            getEnvironment() == Triple::MuslEABI ||
            getEnvironment() == Triple::MuslEABIHF ||
-           getEnvironment() == Triple::MuslX32;
+           getEnvironment() == Triple::MuslX32 ||
+           getEnvironment() == Triple::OpenHOS || isOSLiteOS();
   }
 
+  /// Tests whether the target is OHOS
+  /// LiteOS default enviroment is also OHOS, but omited on triple.
+  bool isOHOSFamily() const { return isOpenHOS() || isOSLiteOS(); }
+
+  bool isOpenHOS() const { return getEnvironment() == Triple::OpenHOS; }
+
+  bool isOSLiteOS() const { return getOS() == Triple::LiteOS; }
+
   /// Tests whether the target is DXIL.
   bool isDXIL() const {
     return getArch() == Triple::dxil;

             getEnvironment() == Triple::MuslEABI ||
             getEnvironment() == Triple::EABIHF ||
             getEnvironment() == Triple::GNUEABIHF ||
+            getEnvironment() == Triple::OpenHOS ||
             getEnvironment() == Triple::MuslEABIHF || isAndroid()) &&
            isOSBinFormatELF();
   }

llvm/include/llvm/BinaryFormat/MinidumpConstants.def

 HANDLE_MDMP_PLATFORM(0x8203, Android) // Android
 HANDLE_MDMP_PLATFORM(0x8204, PS3) // PS3
 HANDLE_MDMP_PLATFORM(0x8205, NaCl) // Native Client (NaCl)
+HANDLE_MDMP_PLATFORM(0x8207, OpenHOS)
 
 HANDLE_MDMP_PROTECT(0x01, NoAccess, PAGE_NO_ACCESS)
 HANDLE_MDMP_PROTECT(0x02, ReadOnly, PAGE_READ_ONLY)

llvm/lib/Support/AArch64TargetParser.cpp

 
 bool AArch64::isX18ReservedByDefault(const Triple &TT) {
   return TT.isAndroid() || TT.isOSDarwin() || TT.isOSFuchsia() ||
-         TT.isOSWindows();
+         TT.isOSWindows() || TT.isOHOSFamily();
 }
 
 // Allows partial match, ex. "v8a" matches "armv8a".

llvm/lib/Support/ARMTargetParser.cpp

   default:
     if (TT.isOSNetBSD())
       return "apcs-gnu";
-    if (TT.isOSOpenBSD())
+    if (TT.isOSOpenBSD() || TT.isOHOSFamily())
       return "aapcs-linux";
     return "aapcs";
   }

llvm/lib/Support/Triple.cpp

   case Win32: return "windows";
   case ZOS: return "zos";
   case ShaderModel: return "shadermodel";
+  case LiteOS: return "liteos";
   }
 
   llvm_unreachable("Invalid OSType");

   case Callable: return "callable";
   case Mesh: return "mesh";
   case Amplification: return "amplification";
+  case OpenHOS: return "ohos";
   }
 
   llvm_unreachable("Invalid EnvironmentType!");

     .StartsWith("wasi", Triple::WASI)
     .StartsWith("emscripten", Triple::Emscripten)
     .StartsWith("shadermodel", Triple::ShaderModel)
+    .StartsWith("liteos", Triple::LiteOS)
     .Default(Triple::UnknownOS);
 }
 

       .StartsWith("callable", Triple::Callable)
       .StartsWith("mesh", Triple::Mesh)
       .StartsWith("amplification", Triple::Amplification)
+      .StartsWith("ohos", Triple::OpenHOS)
       .Default(Triple::UnknownEnvironment);
 }
 

llvm/lib/Target/ARM/ARMSubtarget.h

   }
   bool isTargetMuslAEABI() const {
     return (TargetTriple.getEnvironment() == Triple::MuslEABI ||
-            TargetTriple.getEnvironment() == Triple::MuslEABIHF) &&
+            TargetTriple.getEnvironment() == Triple::MuslEABIHF ||
+            TargetTriple.getEnvironment() == Triple::OpenHOS) &&
            !isTargetDarwin() && !isTargetWindows();
   }
 

llvm/lib/Target/ARM/ARMTargetMachine.cpp

     if ((TargetTriple.getEnvironment() == Triple::GNUEABI ||
          TargetTriple.getEnvironment() == Triple::GNUEABIHF ||
          TargetTriple.getEnvironment() == Triple::MuslEABI ||
-         TargetTriple.getEnvironment() == Triple::MuslEABIHF) &&
+         TargetTriple.getEnvironment() == Triple::MuslEABIHF ||
+         TargetTriple.getEnvironment() == Triple::OpenHOS) &&
         !(TargetTriple.isOSWindows() || TargetTriple.isOSDarwin()))
       this->Options.EABIVersion = EABI::GNU;
     else

llvm/test/CodeGen/AArch64/arm64-platform-reg.ll

 ; RUN: llc -mtriple=arm64-freebsd-gnu -mattr=+reserve-x18 -o - %s | FileCheck %s --check-prefix=CHECK-RESERVE --check-prefix=CHECK-RESERVE-X18
 ; RUN: llc -mtriple=arm64-linux-gnu -o - %s | FileCheck %s
 ; RUN: llc -mtriple=aarch64-linux-android -o - %s | FileCheck %s --check-prefix=CHECK-RESERVE --check-prefix=CHECK-RESERVE-X18
+; RUN: llc -mtriple=aarch64-linux-ohos -o - %s | FileCheck %s --check-prefix=CHECK-RESERVE --check-prefix=CHECK-RESERVE-X18
 ; RUN: llc -mtriple=aarch64-fuchsia -o - %s | FileCheck %s --check-prefix=CHECK-RESERVE --check-prefix=CHECK-RESERVE-X18
 ; RUN: llc -mtriple=aarch64-windows -o - %s | FileCheck %s --check-prefix=CHECK-RESERVE --check-prefix=CHECK-RESERVE-X18
 

llvm/test/Transforms/SafeStack/AArch64/abi.ll

 ; RUN: opt -safe-stack -S -mtriple=aarch64-linux-android < %s -o - | FileCheck %s
+; RUN: opt -safe-stack -S -mtriple=aarch64-linux-ohos < %s -o - | FileCheck %s --check-prefix=OHOS
 
 
 define void @foo() nounwind uwtable safestack {
 entry:
+; OHOS-NOT: call i8* @llvm.thread.pointer()
 ; CHECK: %[[TP:.*]] = call i8* @llvm.thread.pointer()
 ; CHECK: %[[SPA0:.*]] = getelementptr i8, i8* %[[TP]], i32 72
 ; CHECK: %[[SPA:.*]] = bitcast i8* %[[SPA0]] to i8**

llvm/test/Transforms/SafeStack/AArch64/abi_ssp.ll

 ; RUN: opt -safe-stack -S -mtriple=aarch64-linux-android < %s -o - | FileCheck --check-prefixes=TLS,ANDROID %s
+; RUN: opt -safe-stack -S -mtriple=aarch64-linux-ohos < %s -o - | FileCheck --check-prefix=OHOS %s
 ; RUN: opt -safe-stack -S -mtriple=aarch64-unknown-fuchsia < %s -o - | FileCheck --check-prefixes=TLS,FUCHSIA %s
 
 define void @foo() nounwind uwtable safestack sspreq {

 ; The first @llvm.thread.pointer is for the unsafe stack pointer, skip it.
 ; TLS: call i8* @llvm.thread.pointer()
 
+; OHOS-NOT: call i8* @llvm.thread.pointer()
 ; TLS: %[[TP2:.*]] = call i8* @llvm.thread.pointer()
 ; ANDROID: %[[B:.*]] = getelementptr i8, i8* %[[TP2]], i32 40
 ; FUCHSIA: %[[B:.*]] = getelementptr i8, i8* %[[TP2]], i32 -16

llvm/test/Transforms/SafeStack/AArch64/unreachable.ll

 ; RUN: opt -safe-stack -safe-stack-coloring -S -mtriple=aarch64-linux-android < %s -o - | FileCheck %s
+; RUN: opt -safe-stack -safe-stack-coloring -S -mtriple=aarch64-linux-ohos < %s -o - | FileCheck %s --check-prefix=OHOSMUSL
 
 define void @foo() nounwind uwtable safestack {
 entry:
+; OHOSMUSL-NOT: call i8* @llvm.thread.pointer()
 ; CHECK: %[[TP:.*]] = call i8* @llvm.thread.pointer()
 ; CHECK: %[[SPA0:.*]] = getelementptr i8, i8* %[[TP]], i32 72
 ; CHECK: %[[SPA:.*]] = bitcast i8* %[[SPA0]] to i8**

llvm/unittests/ADT/TripleTest.cpp

   EXPECT_EQ(Triple::Amplification, T.getEnvironment());
   EXPECT_FALSE(T.supportsCOMDAT());
 
+  T = Triple("arm-unknown-linux-ohos");
+  EXPECT_EQ(Triple::arm, T.getArch());
+  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
+  EXPECT_EQ(Triple::Linux, T.getOS());
+  EXPECT_EQ(Triple::OpenHOS, T.getEnvironment());
+
+  T = Triple("arm-unknown-liteos");
+  EXPECT_EQ(Triple::arm, T.getArch());
+  EXPECT_EQ(Triple::UnknownVendor, T.getVendor());
+  EXPECT_EQ(Triple::LiteOS, T.getOS());
+  EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment());
+
   T = Triple("huh");
   EXPECT_EQ(Triple::UnknownArch, T.getArch());
 }