Skip to content

Commit cf55d6a

Browse files
jkeiserjkeiser
committed
Move ondemand implementation to include/
1 parent 1cef40c commit cf55d6a

File tree

108 files changed

+603
-557
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+603
-557
lines changed

‎benchmark/bench_sax.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ SIMDJSON_PUSH_DISABLE_ALL_WARNINGS
66
SIMDJSON_POP_DISABLE_WARNINGS
77

88
#if SIMDJSON_IMPLEMENTATION_HASWELL
9-
#include "haswell/begin_implementation.h"
9+
#include "simdjson/haswell/begin.h"
1010
#endif // SIMDJSON_IMPLEMENTATION_HASWELL
1111

1212
#include <iostream>
@@ -31,5 +31,5 @@ SIMDJSON_POP_DISABLE_WARNINGS
3131
BENCHMARK_MAIN();
3232

3333
#if SIMDJSON_IMPLEMENTATION_HASWELL
34-
#include "haswell/end_implementation.h"
34+
#include "simdjson/haswell/end.h"
3535
#endif // SIMDJSON_IMPLEMENTATION_HASWELL

‎include/simdjson.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,12 @@ SIMDJSON_DISABLE_UNDESIRED_WARNINGS
6969
#include "simdjson/dom/parser-inl.h"
7070
#include "simdjson/internal/tape_ref-inl.h"
7171

72+
// Implementations
73+
#include "simdjson/arm64.h"
74+
#include "simdjson/fallback.h"
75+
#include "simdjson/haswell.h"
76+
#include "simdjson/westmere.h"
77+
7278
SIMDJSON_POP_DISABLE_WARNINGS
7379

7480
#endif // SIMDJSON_H

‎include/simdjson/arm64.h‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#ifndef SIMDJSON_ARM64_H
2+
#define SIMDJSON_ARM64_H
3+
4+
#include "simdjson/portability.h"
5+
6+
#if SIMDJSON_IMPLEMENTATION_ARM64
7+
8+
#include "simdjson/arm64/implementation.h"
9+
10+
#include "simdjson/arm64/begin.h"
11+
#include "simdjson/generic/dom_parser_implementation.h"
12+
#include "simdjson/arm64/intrinsics.h"
13+
#include "simdjson/arm64/bitmanipulation.h"
14+
#include "simdjson/arm64/bitmask.h"
15+
#include "simdjson/arm64/simd.h"
16+
#include "simdjson/generic/jsoncharutils.h"
17+
#include "simdjson/generic/atomparsing.h"
18+
#include "simdjson/arm64/stringparsing.h"
19+
#include "simdjson/arm64/numberparsing.h"
20+
#include "simdjson/arm64/end.h"
21+
22+
#endif // SIMDJSON_IMPLEMENTATION_ARM64
23+
24+
#endif // SIMDJSON_ARM64_H

‎include/simdjson/arm64/begin.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#define SIMDJSON_IMPLEMENTATION arm64

‎src/arm64/bitmanipulation.h‎ renamed to ‎include/simdjson/arm64/bitmanipulation.h‎

File renamed without changes.

‎src/arm64/bitmask.h‎ renamed to ‎include/simdjson/arm64/bitmask.h‎

File renamed without changes.

‎include/simdjson/arm64/end.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
#undef SIMDJSON_IMPLEMENTATION

‎src/arm64/implementation.h‎ renamed to ‎include/simdjson/arm64/implementation.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#define SIMDJSON_ARM64_IMPLEMENTATION_H
33

44
#include "simdjson.h"
5-
#include "isadetection.h"
5+
#include "simdjson/internal/isadetection.h"
66

77
namespace simdjson {
88
namespace arm64 {
@@ -12,7 +12,7 @@ using namespace simdjson::dom;
1212

1313
class implementation final : public simdjson::implementation {
1414
public:
15-
simdjson_really_inline implementation() : simdjson::implementation("arm64", "ARM NEON", instruction_set::NEON) {}
15+
simdjson_really_inline implementation() : simdjson::implementation("arm64", "ARM NEON", internal::instruction_set::NEON) {}
1616
SIMDJSON_WARN_UNUSED error_code create_dom_parser_implementation(
1717
size_t capacity,
1818
size_t max_length,

‎src/arm64/intrinsics.h‎ renamed to ‎include/simdjson/arm64/intrinsics.h‎

File renamed without changes.

‎src/arm64/numberparsing.h‎ renamed to ‎include/simdjson/arm64/numberparsing.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ static simdjson_really_inline uint32_t parse_eight_digits_unrolled(const uint8_t
2121

2222
#define SWAR_NUMBER_PARSING
2323

24-
#include "generic/stage2/numberparsing.h"
24+
#include "simdjson/generic/numberparsing.h"
2525

2626
#endif // SIMDJSON_ARM64_NUMBERPARSING_H

0 commit comments

Comments
 (0)