Skip to content

Commit e455069

Browse files
eddyashtonachamayou
eddyashton
and
achamayou
authored
Deplatforming (#7049)
Co-authored-by: Amaury Chamayou <amchamay@microsoft.com>
1 parent 5aef0eb commit e455069

69 files changed

Lines changed: 872 additions & 1279 deletions

Some content is hidden

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

‎.cmake-format.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111
"SRCS": "*",
1212
"INCLUDE_DIRS": "*",
1313
"SYSTEM_INCLUDE_DIRS": "*",
14-
"LINK_LIBS_ENCLAVE": "*",
15-
"LINK_LIBS_VIRTUAL": "*",
16-
"LINK_LIBS_SNP": "*",
14+
"LINK_LIBS": "*",
1715
},
1816
},
1917
"add_client_exe": {

‎.github/workflows/bencher.yml‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,18 @@ jobs:
3333
set -ex
3434
./scripts/setup-ci.sh
3535
36+
- name: "Confirm running on Virtual"
37+
run: |
38+
set -ex
39+
python3 tests/infra/platform_detection.py virtual
40+
shell: bash
41+
3642
- name: Build and run virtual perf tests
3743
run: |
3844
git config --global --add safe.directory /__w/CCF/CCF
3945
mkdir build
4046
cd build
41-
cmake -GNinja -DCOMPILE_TARGET=virtual -DWORKER_THREADS=2 -DBUILD_TPCC=ON ..
47+
cmake -GNinja -DWORKER_THREADS=2 -DBUILD_TPCC=ON ..
4248
ninja
4349
# Microbenchmarks
4450
./tests.sh -VV -L benchmark
@@ -69,12 +75,18 @@ jobs:
6975
with:
7076
fetch-depth: 0
7177

72-
- name: Build and run virtual perf tests
78+
- name: "Confirm running on SEV-SNP"
79+
run: |
80+
set -ex
81+
python3 tests/infra/platform_detection.py snp
82+
shell: bash
83+
84+
- name: Build and run SNP perf tests
7385
run: |
7486
git config --global --add safe.directory /__w/CCF/CCF
7587
mkdir build
7688
cd build
77-
cmake -GNinja -DCOMPILE_TARGET=virtual -DWORKER_THREADS=2 -DBUILD_TPCC=ON ..
89+
cmake -GNinja -DWORKER_THREADS=2 -DBUILD_TPCC=ON ..
7890
ninja
7991
# Microbenchmarks
8092
./tests.sh -VV -L benchmark

‎.github/workflows/ci-verification.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ jobs:
204204
git config --global --add safe.directory /__w/CCF/CCF
205205
mkdir build
206206
cd build
207-
cmake -L -GNinja .. -DCMAKE_BUILD_TYPE=Debug -DVERBOSE_LOGGING=ON -DCOMPILE_TARGET=virtual -DCCF_RAFT_TRACING=ON
207+
cmake -L -GNinja .. -DCMAKE_BUILD_TYPE=Debug -DVERBOSE_LOGGING=ON -DCCF_RAFT_TRACING=ON
208208
ninja raft_driver
209209
shell: bash
210210

‎.github/workflows/ci.yml‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
git config --global --add safe.directory /__w/CCF/CCF
7878
mkdir build
7979
cd build
80-
cmake -GNinja -DCOMPILE_TARGET=virtual -DCMAKE_BUILD_TYPE=Debug -DCLANG_TIDY=ON ..
80+
cmake -GNinja -DCMAKE_BUILD_TYPE=Debug -DCLANG_TIDY=ON ..
8181
ninja
8282
shell: bash
8383

@@ -112,13 +112,19 @@ jobs:
112112
set -ex
113113
./scripts/setup-ci.sh
114114
115+
- name: "Confirm running on Virtual"
116+
run: |
117+
set -ex
118+
python3 tests/infra/platform_detection.py virtual
119+
shell: bash
120+
115121
- name: "Build Debug"
116122
run: |
117123
set -ex
118124
git config --global --add safe.directory /__w/CCF/CCF
119125
mkdir build
120126
cd build
121-
cmake -GNinja -DCOMPILE_TARGET=virtual -DCMAKE_BUILD_TYPE=Debug ..
127+
cmake -GNinja -DCMAKE_BUILD_TYPE=Debug ..
122128
ninja
123129
shell: bash
124130

@@ -178,13 +184,19 @@ jobs:
178184
echo "::endgroup::"
179185
shell: bash
180186

187+
- name: "Confirm running on SEV-SNP"
188+
run: |
189+
set -ex
190+
python3 tests/infra/platform_detection.py snp
191+
shell: bash
192+
181193
- name: "Build Debug"
182194
run: |
183195
set -ex
184196
git config --global --add safe.directory /__w/CCF/CCF
185197
mkdir build
186198
cd build
187-
cmake -GNinja -DCOMPILE_TARGET=snp -DCMAKE_BUILD_TYPE=Debug ..
199+
cmake -GNinja -DCMAKE_BUILD_TYPE=Debug ..
188200
ninja
189201
shell: bash
190202

@@ -255,13 +267,19 @@ jobs:
255267
echo "::endgroup::"
256268
shell: bash
257269

270+
- name: "Confirm running on SEV-SNP"
271+
run: |
272+
set -ex
273+
python3 tests/infra/platform_detection.py snp
274+
shell: bash
275+
258276
- name: "Build Debug"
259277
run: |
260278
set -ex
261279
git config --global --add safe.directory /__w/CCF/CCF
262280
mkdir build
263281
cd build
264-
cmake -GNinja -DCOMPILE_TARGET=snp -DCMAKE_BUILD_TYPE=Debug ..
282+
cmake -GNinja -DCMAKE_BUILD_TYPE=Debug ..
265283
ninja
266284
shell: bash
267285

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
git config --global --add safe.directory /__w/CCF/CCF
7171
mkdir build
7272
cd build
73-
cmake -DCOMPILE_TARGET=virtual -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTS=OFF ..
73+
cmake -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTS=OFF ..
7474
shell: bash
7575

7676
- run: |

‎.github/workflows/long-test.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
git config --global --add safe.directory /__w/CCF/CCF
4646
mkdir build
4747
cd build
48-
cmake -GNinja -DCOMPILE_TARGET=virtual -DCMAKE_BUILD_TYPE=Debug -DLONG_TESTS=ON -DSAN=ON ..
48+
cmake -GNinja -DCMAKE_BUILD_TYPE=Debug -DLONG_TESTS=ON -DSAN=ON ..
4949
ninja
5050
5151
- name: "Test"
@@ -99,7 +99,7 @@ jobs:
9999
git config --global --add safe.directory /__w/CCF/CCF
100100
mkdir build
101101
cd build
102-
cmake -GNinja -DCOMPILE_TARGET=virtual -DCMAKE_BUILD_TYPE=Debug -DLONG_TESTS=ON -DTSAN=ON -DWORKER_THREADS=2 ..
102+
cmake -GNinja -DCMAKE_BUILD_TYPE=Debug -DLONG_TESTS=ON -DTSAN=ON -DWORKER_THREADS=2 ..
103103
ninja
104104
105105
- name: "Test"
@@ -152,7 +152,7 @@ jobs:
152152
git config --global --add safe.directory /__w/CCF/CCF
153153
mkdir build
154154
cd build
155-
cmake -GNinja -DCOMPILE_TARGET=virtual -DCMAKE_BUILD_TYPE=Debug -DLONG_TESTS=ON -DWORKER_THREADS=2 ..
155+
cmake -GNinja -DCMAKE_BUILD_TYPE=Debug -DLONG_TESTS=ON -DWORKER_THREADS=2 ..
156156
ninja
157157
158158
- name: "Test"
@@ -211,7 +211,7 @@ jobs:
211211
mkdir build
212212
cd build
213213
# Use libc++ to enable hardening/bounds checking during tests
214-
cmake -GNinja -DCOMPILE_TARGET=virtual -DCMAKE_BUILD_TYPE=Debug -DLONG_TESTS=ON -DUSE_LIBCXX=ON ..
214+
cmake -GNinja -DCMAKE_BUILD_TYPE=Debug -DLONG_TESTS=ON -DUSE_LIBCXX=ON ..
215215
ninja
216216
217217
- name: "Test"
@@ -265,7 +265,7 @@ jobs:
265265
git config --global --add safe.directory /__w/CCF/CCF
266266
mkdir build
267267
cd build
268-
cmake -GNinja -DCOMPILE_TARGET=virtual -DCMAKE_BUILD_TYPE=Release -DCLIENT_PROTOCOLS_TEST=ON -DLONG_TESTS=ON ..
268+
cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCLIENT_PROTOCOLS_TEST=ON -DLONG_TESTS=ON ..
269269
ninja
270270
271271
- name: "Test"
@@ -319,7 +319,7 @@ jobs:
319319
git config --global --add safe.directory /__w/CCF/CCF
320320
mkdir build
321321
cd build
322-
cmake -GNinja -DCOMPILE_TARGET=virtual -DCMAKE_BUILD_TYPE=Debug -DLONG_TESTS=ON -DSHUFFLE_SUITE=ON ..
322+
cmake -GNinja -DCMAKE_BUILD_TYPE=Debug -DLONG_TESTS=ON -DSHUFFLE_SUITE=ON ..
323323
ninja
324324
325325
- name: "Test"

0 commit comments

Comments
 (0)