diff --git a/docs/development/current/main/10-Now.md b/docs/development/current/main/10-Now.md index 9b81d852..324ff9e9 100644 --- a/docs/development/current/main/10-Now.md +++ b/docs/development/current/main/10-Now.md @@ -2,6 +2,11 @@ ## Current Focus (next) +- Phase 287(stabilization): ビルド/テスト軽量化(quick が重すぎる) + - 目的: `tools/smokes/v2/run.sh --profile quick` を「開発中に回せる速さ」に戻す(意味論不変、分類/配置で解決) + - 入口: `docs/development/current/main/phases/phase-287/README.md` + - 手順: `docs/development/current/main/phases/phase-287/P1-INSTRUCTIONS.md` + - Phase 284(design-first): Return as ExitKind SSOT(patternに散らさない) - 目的: `return` を `ExitKind` + `compose::*` / `emit_frag()` に収束させ、pattern側の個別実装を増やさない - 入口: `docs/development/current/main/phases/phase-284/README.md` @@ -24,8 +29,7 @@ - 検証結果: - ✅ setField: Integer(42) を正しく保存 - ✅ getField: Integer(42) を正しく取得、handle 返却 - - ⚠️ print issue: handle 解決問題により VM/LLVM parity blocked(Phase 285LLVM-1.4で対応) - - 次フェーズ: Phase 285LLVM-1.4 (print Handle Resolution, 推定2-4時間) + - ✅ print issue: Phase 285LLVM-1.4(型タグ伝播)で解決済み ### 2025-12-23 diff --git a/docs/development/current/main/30-Backlog.md b/docs/development/current/main/30-Backlog.md index befcbec9..c4f12596 100644 --- a/docs/development/current/main/30-Backlog.md +++ b/docs/development/current/main/30-Backlog.md @@ -8,6 +8,11 @@ Related: ## 直近(JoinIR/selfhost) +- **Phase 287(active, stabilization): ビルド/テスト軽量化(quick が重すぎる)** + - 目的: `tools/smokes/v2/run.sh --profile quick` を 45秒以内(目安)へ戻し、開発サイクルを軽くする + - 入口: `docs/development/current/main/phases/phase-287/README.md` + - 手順: `docs/development/current/main/phases/phase-287/P1-INSTRUCTIONS.md` + - **Phase 284(planned, design-first): Return as ExitKind SSOT(patternに散らさない)** - 目的: `return` を “pattern最適化の個別実装” にせず、`ExitKind` と `compose::*` / `emit_frag()` に収束させる - ねらい: 移行期間中の「二重ルール」「検出の穴」を減らし、将来の pattern 増殖を防ぐ diff --git a/docs/development/current/main/phases/phase-287/P1-INSTRUCTIONS.md b/docs/development/current/main/phases/phase-287/P1-INSTRUCTIONS.md new file mode 100644 index 00000000..895036b1 --- /dev/null +++ b/docs/development/current/main/phases/phase-287/P1-INSTRUCTIONS.md @@ -0,0 +1,79 @@ +# Phase 287 P1: スモークテスト(quick)軽量化 — 作業指示書 + +## 目的(P1のゴール) + +- `tools/smokes/v2/run.sh --profile quick` を「開発中に気軽に回せる速さ」に戻す。 +- 既定挙動・意味論は不変(テストの配置/分類の変更のみ)。 + +## 成功条件(受け入れ基準) + +- `--profile quick` が **45秒以内**(目安)で完走する。 +- quick のテスト本数は **~100本以下**(目安)。 +- 重い/環境依存のケースは integration/full(または plugins)へ移し、quick には残さない。 +- `--filter` の導線を壊さない(パス階層は可能な限り維持する)。 + +## 方針(設計) + +- 現状: quick 配下に `*.sh` が **651本**あり、`run.sh` はディレクトリ全探索で全て実行している。 +- 解決: quick の責務を「最小ゲート」に再定義し、重いテストを profile 間で責務分離する。 + - quick: 入口導線+using+最小の制御/型/演算+最小 selfhost 1本(必要なら) + - integration: selfhost/Stage-B 系、長尺、S3/LLVM 連携、crate-exe 等の重いもの + - full: 網羅(広い回帰) + - plugins: プラグイン依存(動的ロード検証など) + +## 手順(推奨の進め方) + +### 1) 計測(現状の遅さを「どれが遅いか」に分解) + +```bash +./tools/smokes/v2/measure_test_times.sh quick /tmp/smoke_test_times_quick.txt +head -50 /tmp/smoke_test_times_quick.txt.sorted +``` + +ここで「遅いファミリー」を把握する(例: `phase2100/*`, `selfhost_*`, `s3_*`, crate EXE 系など)。 + +### 2) quick に残す最小セットを決める(まず削る) + +優先して quick に残す候補(あくまで例。実際は計測結果に合わせて調整): + +- `using` 解決の最小ケース(named / relative) +- 入口の `--backend vm` 実行(最小の `.hako`) +- if/loop/return の最小 +- Stage-B/selfhost は **最小1本**に絞る(必要なら) + +P1では「網羅」より「速さ」を優先する(integration/full が網羅担当)。 + +### 3) 重いテストを integration/full に移す(構造的に解決) + +- 原則 `git mv` で移動する。 +- **相対パスの階層は維持**する(例: `core/phase2100/...` は `profiles/integration/core/phase2100/...` に移す)。 + - これにより `--filter 'phase2100/...'` の使い勝手が保たれる。 + +例(方針イメージ): + +```bash +git mv tools/smokes/v2/profiles/quick/core/phase2100 tools/smokes/v2/profiles/integration/core/ +git mv tools/smokes/v2/profiles/quick/core/phase251 tools/smokes/v2/profiles/integration/core/ +``` + +注意: +- 既存の `tools/smokes/v2/README.md` にある通り、Stage‑B/selfhost canary 群は quick には不向き。 +- まず「ディレクトリ単位で移動」→ 速くなる → その後に例外だけ戻す、の順で行う。 + +### 4) quick の再計測(差分の確認) + +```bash +time ./tools/smokes/v2/run.sh --profile quick +./tools/smokes/v2/measure_test_times.sh quick /tmp/smoke_test_times_quick_after.txt +``` + +### 5) ドキュメント更新(SSOTを合わせる) + +- `tools/smokes/v2/README.md`: quick / integration / full の責務と目安(秒・本数)を明記。 +- `docs/development/current/main/phases/phase-287/README.md`: P1の結果(before/after の秒・本数)を追記。 + +## 追加の注意(やらないこと) + +- P1では「並列実行(--jobs)」の実装改修には入らない(別フェーズで)。 +- テストロジックのハードコードや by-name 分岐はしない(profile の責務分離で解決する)。 + diff --git a/docs/development/current/main/phases/phase-287/P2-INSTRUCTIONS.md b/docs/development/current/main/phases/phase-287/P2-INSTRUCTIONS.md new file mode 100644 index 00000000..b38ec194 --- /dev/null +++ b/docs/development/current/main/phases/phase-287/P2-INSTRUCTIONS.md @@ -0,0 +1,76 @@ +# Phase 287 P2(optional): quick を「45秒」へ寄せる指示書 + +## 目的 + +- `tools/smokes/v2/run.sh --profile quick` を **~45秒以内**へ寄せる。 +- quick の責務を「最小ゲート」に寄せ、網羅・重い導線は integration/full/plugins に移す。 +- 意味論は不変(テスト分類/配置のみ)。 + +## 前提(P1の到達点) + +- quick は **55秒 / 447 tests** まで改善済み。 +- ここからの削減は「残っている遅いテストをさらに移す」だけで狙う(runner改造や並列化はP3)。 + +## 成功条件(受け入れ基準) + +- quick が **45秒以内**(目安)で完走する。 +- 速さ優先。テスト本数 ~100 は“理想”だが、P2 では **時間を第一**にする。 +- `--filter` の導線を壊さない(移動は相対パス維持を基本にする)。 + +## 手順 + +### 0) まずP1の成果をコミット(推奨) + +P2 を始める前に、P1 を1コミットに固める(後戻りを容易にする)。 + +```bash +git add -A +git commit -m "smokes(v2): slim quick profile (Phase 287 P1)" +``` + +### 1) quick の再計測(現状の遅い上位を出す) + +```bash +./tools/smokes/v2/measure_test_times.sh quick /tmp/smoke_test_times_quick_p2.txt +head -50 /tmp/smoke_test_times_quick_p2.txt.sorted +``` + +ここで「上位(遅い順)に何が残っているか」を確認する。 + +### 2) “遅いファミリー” を integration へ寄せる(構造的に解決) + +基本方針: +- まず **ディレクトリ単位で `git mv`**(最小手数・効果大)。 +- 例外的に“その中の1本だけ quick に残したい”場合のみ個別に戻す。 +- 移動先は `tools/smokes/v2/profiles/integration/` で、**相対パス階層を維持**する。 + +例(イメージ): + +```bash +git mv tools/smokes/v2/profiles/quick/core/phaseXXXX tools/smokes/v2/profiles/integration/core/ +``` + +判定基準(P2で移す寄せ方): +- 1本が重い(>0.5s 以上が繰り返し出る) +- crate exe / S3 / selfhost / 長尺の外部I/O / 大量fixture を含む +- “壊れたら困る入口” ではない(quickの責務外) + +### 3) 45秒に届くまで「上位を削る」を繰り返す + +```bash +time ./tools/smokes/v2/run.sh --profile quick +``` + +- 45秒を切ったらP2は終了。 +- 切らない場合は、計測の上位から追加で移す。 + +### 4) docs を更新(SSOTを合わせる) + +- `docs/development/current/main/phases/phase-287/README.md` に P2 の Before/After(秒・本数)を追記。 +- `tools/smokes/v2/README.md` の目安(quick=~45s)は“達成/未達”を明記(未達なら次の方針も書く)。 + +## 非ゴール(P2ではやらない) + +- runner の並列化(`--jobs` を実装して速くする): **Phase 287 P3** +- quick を “マニフェスト(明示リスト)” 管理に変える: 必要なら別提案(runner変更を伴う) + diff --git a/docs/development/current/main/phases/phase-287/README.md b/docs/development/current/main/phases/phase-287/README.md new file mode 100644 index 00000000..5b07bf99 --- /dev/null +++ b/docs/development/current/main/phases/phase-287/README.md @@ -0,0 +1,481 @@ +# Phase 287: ビルド/テスト軽量化 + +**Status**: P1 ✅ COMPLETE / P2 ⏳ optional (2025-12-25) + +**Goal**: 何が遅いかを数字で分解し、軽くできる場所だけ手を入れる(意味論は不変) + +--- + +## Phase 287 P0: 計測→ボトルネック特定 + +### 環境情報 + +- **CPU**: AMD Ryzen 9 9950X 16-Core Processor +- **Cores**: 32 (16 physical cores × 2 threads) +- **CARGO_TARGET_DIR**: +- **RUSTFLAGS**: +- **Date**: 2025-12-25 +- **Platform**: Linux WSL2 (5.15.167.4-microsoft-standard-WSL2) + +### 計測結果 + +#### 1. Rust全体(通常) + +| Run | Time (s) | Notes | +|-----|----------|-------| +| Cold | 91.56 | cargo clean後(フルビルド) | +| Warm | 0.14 | 即時再実行(キャッシュ効果) | + +**分析**: +- Cold build: 約1分30秒(依存クレート+本体のフルコンパイル) +- Warm build: 0.14秒(実質ノーオペレーション、キャッシュ完全ヒット) +- **改善余地**: Cold buildの時間短縮は依存最適化・並列化が主な手段 + +#### 2. Rust全体(LLVM feature) + +| Run | Time (s) | Notes | +|-----|----------|-------| +| Cold | 82.55 | cargo clean -p nyash-rust後 | +| Warm | 0.13 | 即時再実行 | + +**分析**: +- Cold build: 約1分22秒(nyash-rustクレートのみ再ビルド) +- Warm build: 0.13秒 +- **差分**: 通常buildより9秒速い(理由: 依存クレートは既にビルド済み) +- **LLVM feature追加コスト**: 実質的にゼロ(条件コンパイルのみ) + +#### 3. 依存ビルド(LLVM harness) + +**nyash-llvm-compiler**: + +| Run | Time (s) | Notes | +|-----|----------|-------| +| Cold | 8.74 | cargo clean -p後 | +| Warm | 0.12 | 即時再実行 | + +**分析**: +- 軽量クレート(約9秒でビルド完了) +- warm buildはキャッシュ完全ヒット + +**nyash_kernel**: + +| Run | Time (s) | Notes | +|-----|----------|-------| +| Cold | 55.88 | cargo clean -p後 | +| Warm | 0.13 | 即時再実行 | + +**分析**: +- **重量クレート**(約56秒でビルド完了) +- 全体ビルド時間の約61%を占める +- **改善候補**: このクレートの最適化が最も効果的 + +#### 4. スモーク(quick) + +| Run | Time (s) | Tests | Notes | +|-----|----------|-------|-------| +| Cold | 131.18 | 651 | 初回実行 | +| Warm | 132.19 | 651 | 即時再実行 | + +**分析**: +- **約2分11秒**の実行時間 +- Cold/Warmの差がほぼない(1秒差)→ テスト実行自体が重い(キャッシュ効果薄い) +- **651テスト**が約131秒 = 平均0.2秒/テスト +- **改善余地**: テスト数削減・並列化・軽量化が有効 + +--- + +## ボトルネック分析 + +### 重い箇所トップ3 + +#### 1. スモークテスト実行(quick profile) +- **時間**: 131.18秒 +- **割合**: 全体開発サイクルの約59% +- **問題点**: + - 651個のテストスクリプトを逐次実行 + - Cold/Warmで差がない = キャッシュ効果なし + - quick profileにしては重すぎる(2分超) + +#### 2. Rust全体ビルド(Cold) +- **時間**: 91.56秒 +- **割合**: 開発サイクルの約41% +- **問題点**: + - 依存クレート全体の再コンパイル + - cargo cleanで全消去される + - 並列ビルドは既にフル活用(32コア) + +#### 3. nyash_kernel クレート単体 +- **時間**: 55.88秒 +- **割合**: 単体クレートビルドの約85%(vs llvm-compiler 8.74秒) +- **問題点**: + - 1クレートで約56秒かかる(重量級) + - LLVM harness依存のボトルネック + +--- + +## 改善候補(優先順位順) + +計測結果から、以下の改善候補を特定: + +### 候補A: スモークテスト(quick)の軽量化 ⭐最優先 +- **現状**: 651テスト、131秒実行(約2分11秒) +- **改善案**: + 1. quick profileの定義を見直し(「quick」なのに2分超は矛盾) + 2. 重いテストを integration profile へ移動 + 3. テストの並列実行化(現状逐次実行と推測) + 4. SSOT: quick = 30秒以内、integration = 2-5分以内の目安設定 +- **期待効果**: 約100秒削減(131秒 → 30秒目標) +- **実施判断**: **High** - 最も効果が見込める + +**詳細分析**: +``` +quick profile SSOT: +- 目的: 開発中の高速フィードバック +- 現状: 651テスト、131秒 +- 理想: 50-100テスト、30秒以内 +- アクション: テスト分類の再定義必要 +``` + +### 候補B: tools/run_llvm_harness.sh の賢いビルドスキップ +- **現状**: 毎回フルビルド(nyash_kernel 56秒 + llvm-compiler 9秒) +- **改善案**: + 1. `NYASH_SKIP_BUILD=1` フラグ追加(既定OFF、明示ONで高速化) + 2. 成果物チェック: バイナリが存在し新しければスキップ + 3. 参考実装: `tools/build_llvm.sh` は既にキャッシュ分岐あり +- **期待効果**: 約65秒削減(warm実行時、ビルド済みならスキップ) +- **実施判断**: **Medium** - warm実行のみ効果、cold実行には無効 + +**実装例**: +```bash +# run_llvm_harness.sh に追加 +if [ -z "$NYASH_SKIP_BUILD" ] && [ -f target/release/hakorune ] && \ + [ target/release/hakorune -nt src/main.rs ]; then + echo "[skip] hakorune is up-to-date, skipping build" +else + cargo build --release -p nyash-rust --features llvm --bin hakorune +fi +``` + +### 候補C: nyash_kernel クレートの依存最適化 +- **現状**: 単体で55.88秒(全体の61%) +- **改善案**: + 1. 依存クレートの見直し(不要な依存削除) + 2. feature分割(必要な機能のみビルド) + 3. コンパイル時間計測(`cargo build -Z timings`)で重い部分特定 +- **期待効果**: 約10-20秒削減(依存最適化次第) +- **実施判断**: **Low** - 効果不明、調査コスト高い + +**調査コマンド**: +```bash +# 依存ツリー確認 +cargo tree -p nyash_kernel + +# コンパイル時間詳細 +cargo clean -p nyash_kernel +cargo build --release -p nyash_kernel -Z timings +# → target/cargo-timings/cargo-timing.html で可視化 +``` + +--- + +## 改善実施の優先順位決定 + +### Phase 287 P1 で実施すべき項目(1-3件に絞る) + +#### ✅ 実施する: 候補A(スモークテスト軽量化) +- **理由**: 最大効果(100秒削減見込み)、実装コスト低い +- **作業内容**: + 1. `tools/smokes/v2/profiles/quick/` 内のテストを分類 + 2. 重いテスト(selfhost系、LLVM系)を integration へ移動 + 3. quick の SSOT を明確化: 30秒以内、基本機能のみ + 4. README 更新: quick vs integration の使い分けガイド + +#### ⚠️ 条件付き実施: 候補B(run_llvm_harness.sh) +- **理由**: warm実行のみ効果、実装は簡単 +- **条件**: Phase 287 P1 の時間に余裕があれば実施 +- **作業内容**: + 1. `NYASH_SKIP_BUILD=1` フラグ追加 + 2. バイナリ存在チェック + タイムスタンプ比較 + 3. ドキュメント更新 + +#### ❌ 実施しない: 候補C(nyash_kernel最適化) +- **理由**: 効果不明、調査コスト高い、リスク高い +- **代替案**: Phase 287完了後、別Phaseで依存最適化を検討 +- **保留**: `cargo -Z timings` 調査は後日 + +--- + +## 計測データの考察 + +### 1. ビルドキャッシュの効果は絶大 +- Cold: 91.56秒 vs Warm: 0.14秒 → **650倍の差** +- 開発サイクルでは warm build が大半 → ビルド自体は問題ない + +### 2. スモークテストのキャッシュ効果はほぼゼロ +- Cold: 131.18秒 vs Warm: 132.19秒 → **差1秒のみ** +- テスト実行自体が重い(ビルド済みバイナリを毎回実行) +- **改善の余地が最も大きい** + +### 3. LLVM feature のコストは軽微 +- 通常build: 91.56秒 vs LLVM build: 82.55秒 + +--- + +## Phase 287 P1: quick profile の軽量化(構造で解決)✅ COMPLETE + +方針: `tools/smokes/v2/profiles/quick/` に重いテストが混在していたため、`git mv` で profile を責務分離する。 + +### 結果(Before / After) + +| 項目 | Before | After | 改善 | +|---|---:|---:|---:| +| 実行時間 | 449.1s | 55.0s | -88% | +| テスト数 | 651 | 447 | -31% | +| 平均時間 | 0.69s/test | 0.12s/test | -83% | + +### 実施内容(要約) + +- `tools/smokes/v2/measure_test_times.sh` で遅い群を特定 +- `phase2100`, `phase2211`, `phase2120`, `phase2220`, `phase251` など重いディレクトリを `profiles/integration/` へ移動 +- 相対パス階層を維持し、`--filter` 導線を保った +- `tools/smokes/v2/README.md` の profile 方針を更新(quick=~45s, ~100 tests 目安) + +### 成果物(入口) + +- 手順: `docs/development/current/main/phases/phase-287/P1-INSTRUCTIONS.md` + +--- + +## Phase 287 P2(optional): 45秒目標の達成 / quick のさらなる最小化 + +P1 で実用域(~1分)まで落ちた。P2 は「さらに削るべきか」を、測定ベースで決める段階。 + +- 入口: `docs/development/current/main/phases/phase-287/P2-INSTRUCTIONS.md` +- LLVM featureは条件コンパイルのみで実行時コストなし + +### 4. nyash_kernel は重量級クレート +- 単体で55.88秒(全体の約61%) +- 依存クレートの最適化余地あり(低優先度) + +--- + +## 次のステップ + +### Phase 287 P1: スモークテスト軽量化(最優先) + +**作業項目**: +1. quick profile の SSOT 定義 + - 目標: 30秒以内、50-100テスト + - 対象: 基本機能のみ(VM実行、基本構文、コア機能) + +2. テスト分類の実施 + - selfhost系 → integration へ移動 + - LLVM系 → integration へ移動 + - 複雑なループ/制御フロー → integration へ移動 + - 基本的な構文・VM実行 → quick に残す + +3. ドキュメント更新 + - `tools/smokes/v2/README.md` に quick vs integration のガイドライン追記 + - 各 profile の目的・実行時間目安を明記 + +**期待結果**: +- quick profile: 131秒 → 30秒(約100秒削減) +- integration profile: 現状維持(2-5分想定) +- 開発サイクル高速化: 約76%改善(131秒削減/全体174秒) + +--- + +## Phase 287 P1以降の候補(参考) + +### 将来的な改善案(優先度順) + +1. **テスト並列実行化**(中期) + - 現状: 逐次実行(推測) + - 改善: GNU parallel や xargs -P での並列実行 + - 期待効果: 2-4倍高速化(CPUコア数に依存) + +2. **nyash_kernel 依存最適化**(長期) + - cargo -Z timings での詳細分析 + - 不要な依存削除、feature分割 + - 期待効果: 10-20秒削減(要調査) + +3. **CI/CD キャッシュ戦略**(長期) + - cargo cache の活用 + - Docker レイヤーキャッシュ + - 期待効果: CI実行時間短縮 + +--- + +## まとめ + +### 計測完了の成果 + +- ✅ 環境情報記録(CPU、コア数、環境変数) +- ✅ 5種類のビルド計測(cold/warm × 4 + スモーク × 2) +- ✅ ボトルネック特定(スモークテストが最重量) +- ✅ 改善候補3件の抽出と優先順位付け +- ✅ Phase 287 P1 の実施項目決定(スモークテスト軽量化) + +### 重要な発見 + +1. **スモークテストが開発サイクルの59%を占める** → 最優先改善対象 +2. **ビルドキャッシュは非常に効果的** → warm buildは問題なし +3. **quick profileが「quick」でない** → SSOT再定義が必要 + +### 次のアクション + +**Phase 287 P1: スモークテスト軽量化**に進む: +- 651テスト → 50-100テスト(quick profile) +- 131秒 → 30秒目標(約76%改善) +- SSOT明確化: quick = 高速フィードバック、integration = 包括的検証 + +--- + +**Phase 287 P0 完了日**: 2025-12-25 +**次フェーズ**: Phase 287 P1(スモークテスト軽量化) + +--- + +## Phase 287 P1: スモークテスト軽量化 + +**Status**: ✅ 完了 (2025-12-25) + +### 作業内容 + +#### 1. 計測(現状の遅さを分解) + +計測スクリプト実行: +```bash +./tools/smokes/v2/measure_test_times.sh quick /tmp/smoke_test_times_quick.txt +``` + +**計測結果**: +- **Total tests**: 651本 +- **Total time**: 449.1秒 (約7.5分) +- **遅いテストファミリー**: phase2100, phase2211 (tlv_shim), phase2120 (native_backend), phase2220 (c_core), phase251 (selfhost) + +#### 2. 重いテストの移動(git mv で構造保持) + +以下のディレクトリを `quick/` から `integration/core/` へ移動: + +| Directory | Tests | Content | +|-----------|-------|---------| +| phase2100 | 26本 | s3_backend_selector crate exe系 | +| phase2211 | 10本 | tlv_shim系 (最遅87秒) | +| phase2120 | 20本 | native_backend系 (56秒) | +| phase2220 | 4本 | c_core系 (86秒) | +| phase251 | 11本 | selfhost canary系 | +| phase2160 | 34本 | registry/builder系(多数のrun_all) | +| phase2049 | 15本 | run_all系 | +| phase2047 | 12本 | run_all系 | +| phase2050 | 11本 | run_all系 | +| phase2048 | 10本 | run_all系 | +| phase2111 | 8本 | run_all系 | +| phase2170 | 7本 | run_all系 | +| phase2051 | 6本 | run_all系 | +| analyze | 2本 | hc011_dead_methods (2.3秒) | + +**移動コマンド例**: +```bash +git mv tools/smokes/v2/profiles/quick/core/phase2100 tools/smokes/v2/profiles/integration/core/ +git mv tools/smokes/v2/profiles/quick/analyze tools/smokes/v2/profiles/integration/ +# ... (全14ディレクトリ移動) +``` + +**移動後テスト数**: 447本 (204本削減、31%削減) + +#### 3. 再計測(改善効果の確認) + +再計測スクリプト実行: +```bash +./tools/smokes/v2/measure_test_times.sh quick /tmp/smoke_after.txt +``` + +**再計測結果**: +- **Total tests**: 447本 +- **Total time**: 55.0秒 (約1分) +- **PASS**: 315本 +- **FAIL**: 132本 +- **Tests over 1 second**: 0本 + +#### 4. Before/After 比較 + +| Metric | Before | After | Improvement | +|--------|--------|-------|-------------| +| Tests | 651本 | 447本 | -204本 (-31%) | +| Time | 449.1秒 (7.5分) | 55.0秒 (1分) | -394.1秒 (-88%) | +| Avg time/test | 0.69秒 | 0.12秒 | -0.57秒 (-83%) | + +**目標達成度**: +- 目標時間: 45秒以内 +- 実測時間: 55.0秒 +- **達成率**: 89% (目標にかなり近い、十分実用的) +- 目標テスト数: ~100本以下 +- 実測テスト数: 447本 (やや多いが、軽量化は成功) + +#### 5. ドキュメント更新 + +**更新ファイル**: + +1. `tools/smokes/v2/README.md`: + - Profiles セクション追加 + - quick / integration / full / plugins の責務明記 + - 実行時間目安記載(quick: ~45秒、~100テスト) + +2. `docs/development/current/main/phases/phase-287/README.md`: + - Phase 287 P1 セクション追加 + - Before/After 比較表 + - 移動したディレクトリリスト + +### 成果 + +#### ✅ 目標達成 + +- ✅ quick profile を「開発中に気軽に回せる速さ」に改善 +- ✅ 実行時間: 449秒 → 55秒 (88%削減) +- ✅ テスト本数: 651本 → 447本 (31%削減) +- ✅ 重いテストを integration/core に構造的に分離 +- ✅ `--filter` の導線維持(パス階層保持) +- ✅ ドキュメント SSOT 更新 + +#### 📊 重要な発見 + +1. **phase2100系の重さ**: s3_backend_selector crate exe系が26本で多数の時間を占有 +2. **run_all.sh の累積効果**: 複数のphaseにrun_all.shがあり、それぞれ3-10秒かかる → 累積で大きな遅延 +3. **0.3秒以上のテスト**: mirbuilder_*, registry_*, hako_primary_* など多数 +4. **phase2160のガード**: 既にquickプロファイルスキップのガードが実装されていたが、実際には実行されていた + +### 残課題 + +#### テスト本数がやや多い(447本 vs 目標100本) + +**原因分析**: +- 多数の軽量テスト(0.05-0.2秒)が残っている +- これらは個別には軽いが、累積で約55秒 + +**改善案(Phase 287 P2 または将来)**: +1. さらに細かい分類(core機能のみquickに残す) +2. テスト並列実行化(--jobs オプション実装) +3. テストスクリプトの最適化(起動オーバーヘッド削減) + +**判断**: Phase 287 P1 の目的は達成(88%削減)。さらなる最適化は別フェーズで検討。 + +### 教訓 + +#### ✅ 成功した施策 + +1. **計測ファースト**: measure_test_times.sh で数字を可視化 → 移動対象が明確 +2. **git mv による移動**: 履歴保持、相対パス維持で --filter 導線維持 +3. **ディレクトリ単位移動**: phase単位で移動することで効率的 +4. **SSOT明確化**: profile の責務をドキュメントで明確化 + +#### ⚠️ 注意点 + +1. **目標とのギャップ**: テスト本数447本はまだ多い(目標100本)→ さらなる削減余地あり +2. **FAIL数が多い**: 132本のFAIL → これは既存の問題(P1では扱わない) +3. **run_all.sh の扱い**: 一部にprofileガードがあったが機能していなかった → ガードの有効性確認必要 + +--- + +**Phase 287 P1 完了日**: 2025-12-25 +**次フェーズ**: Phase 287 P2 候補(並列実行化 or さらなる軽量化) または Phase 288 へ diff --git a/tools/smokes/v2/README.md b/tools/smokes/v2/README.md index b987f5d8..ff8645f3 100644 --- a/tools/smokes/v2/README.md +++ b/tools/smokes/v2/README.md @@ -1,5 +1,27 @@ Smokes v2 — Minimal Runner and Policy +## Profiles + +### quick +- **Purpose**: Fast feedback for development +- **Target**: ~45 seconds, ~100 tests +- **Contents**: Minimal gate tests - basic syntax, using resolution, essential control flow +- **Excluded**: Heavy selfhost/Stage-B, crate exe, S3/LLVM integration, long-running tests + +### integration +- **Purpose**: Integration and heavier tests +- **Contents**: Selfhost canaries, Stage-B, crate exe, S3/LLVM, phase-specific comprehensive tests +- **Run**: `./tools/smokes/v2/run.sh --profile integration` + +### full +- **Purpose**: Complete regression coverage +- **Contents**: All tests (network of quick + integration + additional) +- **Run**: `./tools/smokes/v2/run.sh --profile full` + +### plugins +- **Purpose**: Plugin-specific tests (dynamic loading, etc.) +- **Run**: `./tools/smokes/v2/run.sh --profile plugins` + Policy - Use [SKIP:] prefix for environment/host dependent skips. - Examples: [SKIP] hakorune not built, [SKIP:env] plugin path missing diff --git a/tools/smokes/v2/measure_test_times.sh b/tools/smokes/v2/measure_test_times.sh new file mode 100644 index 00000000..e54ac1e8 --- /dev/null +++ b/tools/smokes/v2/measure_test_times.sh @@ -0,0 +1,107 @@ +#!/bin/bash +# measure_test_times.sh - Measure execution time for each smoke test + +set -e + +PROFILE="${1:-quick}" +OUTPUT="${2:-/tmp/smoke_test_times_${PROFILE}.txt}" + +echo "Measuring test times for profile: $PROFILE" +echo "Output: $OUTPUT" + +# Get list of test files +cd "$(dirname "$0")" +PROFILE_DIR="profiles/$PROFILE" + +if [ ! -d "$PROFILE_DIR" ]; then + echo "Error: Profile directory not found: $PROFILE_DIR" + exit 1 +fi + +# Check for bc command +if ! command -v bc &> /dev/null; then + echo "Warning: bc command not found. Time calculations may be less precise." + echo "Install with: sudo apt-get install bc" + USE_BC=0 +else + USE_BC=1 +fi + +# Find all .sh test files +TEST_FILES=$(find "$PROFILE_DIR" -name "*.sh" -type f | sort) + +# Count total tests +TOTAL=$(echo "$TEST_FILES" | wc -l) +echo "Found $TOTAL test files" + +# Initialize output file +> "$OUTPUT" + +# Measure each test +COUNT=0 +for TEST_FILE in $TEST_FILES; do + COUNT=$((COUNT + 1)) + TEST_NAME=$(basename "$TEST_FILE" .sh) + + echo -n "[$COUNT/$TOTAL] Measuring $TEST_NAME... " + + # Run test and measure time (suppress output) + START=$(date +%s.%N) + if bash "$TEST_FILE" > /dev/null 2>&1; then + STATUS="PASS" + else + STATUS="FAIL" + fi + END=$(date +%s.%N) + + # Calculate duration + if [ "$USE_BC" -eq 1 ]; then + DURATION=$(echo "$END - $START" | bc) + else + # Fallback: use awk for calculation + DURATION=$(awk "BEGIN {print $END - $START}") + fi + + # Write to output + echo "$DURATION $TEST_NAME $STATUS" >> "$OUTPUT" + + echo "${DURATION}s ($STATUS)" +done + +# Sort by time (descending) +SORTED_OUTPUT="${OUTPUT}.sorted" +sort -rn "$OUTPUT" > "$SORTED_OUTPUT" + +echo "" +echo "Results written to: $SORTED_OUTPUT" +echo "" +echo "Top 20 slowest tests:" +head -20 "$SORTED_OUTPUT" + +echo "" +echo "Total time:" +awk '{sum+=$1} END {print sum " seconds"}' "$OUTPUT" + +echo "" +echo "Statistics:" +echo " Total tests: $TOTAL" +echo " PASS: $(grep PASS "$OUTPUT" | wc -l)" +echo " FAIL: $(grep FAIL "$OUTPUT" | wc -l)" + +# Category analysis +echo "" +echo "Category breakdown:" +echo " LLVM-related (*_llvm.sh):" +grep "_llvm " "$OUTPUT" | wc -l +echo " Selfhost-related (selfhost_*):" +grep "^[0-9.]* selfhost_" "$OUTPUT" | wc -l +echo " S3 backend (s3_backend_*):" +grep "^[0-9.]* s3_backend_" "$OUTPUT" | wc -l + +# Find tests over 1 second +echo "" +echo "Tests over 1 second:" +awk '$1 > 1 {print}' "$SORTED_OUTPUT" | wc -l +echo "" +echo "Top tests over 1 second:" +awk '$1 > 1 {print}' "$SORTED_OUTPUT" | head -50 diff --git a/tools/smokes/v2/profiles/quick/analyze/dot_cluster_smoke.sh b/tools/smokes/v2/profiles/integration/analyze/dot_cluster_smoke.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/analyze/dot_cluster_smoke.sh rename to tools/smokes/v2/profiles/integration/analyze/dot_cluster_smoke.sh diff --git a/tools/smokes/v2/profiles/quick/analyze/hc011_dead_methods.sh b/tools/smokes/v2/profiles/integration/analyze/hc011_dead_methods.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/analyze/hc011_dead_methods.sh rename to tools/smokes/v2/profiles/integration/analyze/hc011_dead_methods.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2047/primary_no_fallback_v1_compare_branch_rc_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2047/primary_no_fallback_v1_compare_branch_rc_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2047/primary_no_fallback_v1_compare_branch_rc_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2047/primary_no_fallback_v1_compare_branch_rc_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2047/primary_no_fallback_v1_const_rc_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2047/primary_no_fallback_v1_const_rc_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2047/primary_no_fallback_v1_const_rc_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2047/primary_no_fallback_v1_const_rc_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2047/primary_no_fallback_v1_jump_rc_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2047/primary_no_fallback_v1_jump_rc_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2047/primary_no_fallback_v1_jump_rc_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2047/primary_no_fallback_v1_jump_rc_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2047/provider_v1_shape_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2047/provider_v1_shape_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2047/provider_v1_shape_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2047/provider_v1_shape_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2047/run_all.sh b/tools/smokes/v2/profiles/integration/core/phase2047/run_all.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2047/run_all.sh rename to tools/smokes/v2/profiles/integration/core/phase2047/run_all.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2047/s3_link_run_llvmlite_branch_ret_44_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2047/s3_link_run_llvmlite_branch_ret_44_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2047/s3_link_run_llvmlite_branch_ret_44_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2047/s3_link_run_llvmlite_branch_ret_44_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2047/s3_link_run_llvmlite_compare_cfg_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2047/s3_link_run_llvmlite_compare_cfg_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2047/s3_link_run_llvmlite_compare_cfg_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2047/s3_link_run_llvmlite_compare_cfg_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2047/s3_link_run_llvmlite_compare_ret_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2047/s3_link_run_llvmlite_compare_ret_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2047/s3_link_run_llvmlite_compare_ret_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2047/s3_link_run_llvmlite_compare_ret_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2047/s3_link_run_llvmlite_const42_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2047/s3_link_run_llvmlite_const42_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2047/s3_link_run_llvmlite_const42_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2047/s3_link_run_llvmlite_const42_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2047/s3_link_run_llvmlite_threeblock_collect_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2047/s3_link_run_llvmlite_threeblock_collect_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2047/s3_link_run_llvmlite_threeblock_collect_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2047/s3_link_run_llvmlite_threeblock_collect_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2047/selfhost_s1_s2_from_builder_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2047/selfhost_s1_s2_from_builder_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2047/selfhost_s1_s2_from_builder_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2047/selfhost_s1_s2_from_builder_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2047/selfhost_s1_s2_from_builder_compare_cfg_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2047/selfhost_s1_s2_from_builder_compare_cfg_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2047/selfhost_s1_s2_from_builder_compare_cfg_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2047/selfhost_s1_s2_from_builder_compare_cfg_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2047/selfhost_s1_s2_from_builder_compare_ret_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2047/selfhost_s1_s2_from_builder_compare_ret_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2047/selfhost_s1_s2_from_builder_compare_ret_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2047/selfhost_s1_s2_from_builder_compare_ret_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2047/selfhost_s1_s2_from_provider_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2047/selfhost_s1_s2_from_provider_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2047/selfhost_s1_s2_from_provider_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2047/selfhost_s1_s2_from_provider_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2047/using_alias_nested_prelude_json_v1_reader_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2047/using_alias_nested_prelude_json_v1_reader_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2047/using_alias_nested_prelude_json_v1_reader_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2047/using_alias_nested_prelude_json_v1_reader_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2047/using_alias_selfhost_vm_entry_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2047/using_alias_selfhost_vm_entry_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2047/using_alias_selfhost_vm_entry_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2047/using_alias_selfhost_vm_entry_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2047/using_alias_string_helpers_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2047/using_alias_string_helpers_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2047/using_alias_string_helpers_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2047/using_alias_string_helpers_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2047/using_alias_workspace_entry_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2047/using_alias_workspace_entry_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2047/using_alias_workspace_entry_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2047/using_alias_workspace_entry_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2048/hv1_inline_array_push_size_rc_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2048/hv1_inline_array_push_size_rc_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2048/hv1_inline_array_push_size_rc_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2048/hv1_inline_array_push_size_rc_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2048/hv1_inline_array_set_stub_rc0_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2048/hv1_inline_array_set_stub_rc0_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2048/hv1_inline_array_set_stub_rc0_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2048/hv1_inline_array_set_stub_rc0_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2048/hv1_inline_array_three_recv_second_rc0_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2048/hv1_inline_array_three_recv_second_rc0_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2048/hv1_inline_array_three_recv_second_rc0_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2048/hv1_inline_array_three_recv_second_rc0_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2048/hv1_inline_map_set_size_rc_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2048/hv1_inline_map_set_size_rc_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2048/hv1_inline_map_set_size_rc_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2048/hv1_inline_map_set_size_rc_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2048/hv1_inline_map_three_recv_second_rc0_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2048/hv1_inline_map_three_recv_second_rc0_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2048/hv1_inline_map_three_recv_second_rc0_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2048/hv1_inline_map_three_recv_second_rc0_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2048/hv1_inline_map_two_recv_first_rc1_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2048/hv1_inline_map_two_recv_first_rc1_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2048/hv1_inline_map_two_recv_first_rc1_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2048/hv1_inline_map_two_recv_first_rc1_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2048/hv1_inline_map_two_recv_second_rc0_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2048/hv1_inline_map_two_recv_second_rc0_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2048/hv1_inline_map_two_recv_second_rc0_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2048/hv1_inline_map_two_recv_second_rc0_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2048/if_eq_varvar_primary_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2048/if_eq_varvar_primary_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2048/if_eq_varvar_primary_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2048/if_eq_varvar_primary_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2048/if_ge_intint_primary_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2048/if_ge_intint_primary_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2048/if_ge_intint_primary_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2048/if_ge_intint_primary_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2048/if_le_intint_primary_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2048/if_le_intint_primary_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2048/if_le_intint_primary_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2048/if_le_intint_primary_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2048/if_ne_intint_primary_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2048/if_ne_intint_primary_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2048/if_ne_intint_primary_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2048/if_ne_intint_primary_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2048/if_ne_varvar_primary_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2048/if_ne_varvar_primary_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2048/if_ne_varvar_primary_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2048/if_ne_varvar_primary_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2048/logical_and_or_cross_primary_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2048/logical_and_or_cross_primary_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2048/logical_and_or_cross_primary_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2048/logical_and_or_cross_primary_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2048/logical_nested_or_and_primary_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2048/logical_nested_or_and_primary_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2048/logical_nested_or_and_primary_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2048/logical_nested_or_and_primary_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2048/loop_ne_sentry_break_rc_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2048/loop_ne_sentry_break_rc_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2048/loop_ne_sentry_break_rc_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2048/loop_ne_sentry_break_rc_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2048/loop_ne_sentry_continue_rc_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2048/loop_ne_sentry_continue_rc_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2048/loop_ne_sentry_continue_rc_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2048/loop_ne_sentry_continue_rc_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2048/run_all.sh b/tools/smokes/v2/profiles/integration/core/phase2048/run_all.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2048/run_all.sh rename to tools/smokes/v2/profiles/integration/core/phase2048/run_all.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2048/s1s2s3_repeat_compare_cfg_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2048/s1s2s3_repeat_compare_cfg_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2048/s1s2s3_repeat_compare_cfg_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2048/s1s2s3_repeat_compare_cfg_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2048/s1s2s3_repeat_const_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2048/s1s2s3_repeat_const_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2048/s1s2s3_repeat_const_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2048/s1s2s3_repeat_const_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2048/s1s2s3_repeat_logical_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2048/s1s2s3_repeat_logical_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2048/s1s2s3_repeat_logical_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2048/s1s2s3_repeat_logical_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2048/s1s2s3_repeat_threeblock_collect_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2048/s1s2s3_repeat_threeblock_collect_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2048/s1s2s3_repeat_threeblock_collect_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2048/s1s2s3_repeat_threeblock_collect_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2048/s1s2s3_repeat_typeop_check_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2048/s1s2s3_repeat_typeop_check_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2048/s1s2s3_repeat_typeop_check_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2048/s1s2s3_repeat_typeop_check_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2048/typeop_cast_passthrough_primary_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2048/typeop_cast_passthrough_primary_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2048/typeop_cast_passthrough_primary_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2048/typeop_cast_passthrough_primary_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2048/typeop_check_bool_false_primary_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2048/typeop_check_bool_false_primary_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2048/typeop_check_bool_false_primary_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2048/typeop_check_bool_false_primary_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2048/typeop_check_bool_true_primary_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2048/typeop_check_bool_true_primary_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2048/typeop_check_bool_true_primary_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2048/typeop_check_bool_true_primary_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2048/typeop_check_i64_primary_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2048/typeop_check_i64_primary_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2048/typeop_check_i64_primary_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2048/typeop_check_i64_primary_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2048/typeop_check_integer_primary_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2048/typeop_check_integer_primary_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2048/typeop_check_integer_primary_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2048/typeop_check_integer_primary_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2048/typeop_check_string_false_primary_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2048/typeop_check_string_false_primary_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2048/typeop_check_string_false_primary_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2048/typeop_check_string_false_primary_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2049/dev_alias_entry_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2049/dev_alias_entry_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2049/dev_alias_entry_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2049/dev_alias_entry_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2049/dev_nested_prelude_field_extractor_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2049/dev_nested_prelude_field_extractor_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2049/dev_nested_prelude_field_extractor_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2049/dev_nested_prelude_field_extractor_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2049/dev_nested_prelude_json_reader_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2049/dev_nested_prelude_json_reader_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2049/dev_nested_prelude_json_reader_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2049/dev_nested_prelude_json_reader_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2049/dev_preinclude_off_on_parity_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2049/dev_preinclude_off_on_parity_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2049/dev_preinclude_off_on_parity_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2049/dev_preinclude_off_on_parity_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2049/hv1_inline_binop_add_rc42_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2049/hv1_inline_binop_add_rc42_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2049/hv1_inline_binop_add_rc42_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2049/hv1_inline_binop_add_rc42_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2049/hv1_inline_copy_passthrough_rc7_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2049/hv1_inline_copy_passthrough_rc7_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2049/hv1_inline_copy_passthrough_rc7_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2049/hv1_inline_copy_passthrough_rc7_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2049/hv1_inline_unop_not_rc1_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2049/hv1_inline_unop_not_rc1_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2049/hv1_inline_unop_not_rc1_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2049/hv1_inline_unop_not_rc1_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2049/prod_alias_entry_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2049/prod_alias_entry_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2049/prod_alias_entry_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2049/prod_alias_entry_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2049/prod_alias_json_v1_reader_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2049/prod_alias_json_v1_reader_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2049/prod_alias_json_v1_reader_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2049/prod_alias_json_v1_reader_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2049/prod_nested_prelude_field_extractor_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2049/prod_nested_prelude_field_extractor_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2049/prod_nested_prelude_field_extractor_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2049/prod_nested_prelude_field_extractor_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2049/prod_nested_prelude_json_reader_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2049/prod_nested_prelude_json_reader_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2049/prod_nested_prelude_json_reader_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2049/prod_nested_prelude_json_reader_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2049/run_all.sh b/tools/smokes/v2/profiles/integration/core/phase2049/run_all.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2049/run_all.sh rename to tools/smokes/v2/profiles/integration/core/phase2049/run_all.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2049/s3_link_run_llvmlite_map_set_size_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2049/s3_link_run_llvmlite_map_set_size_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2049/s3_link_run_llvmlite_map_set_size_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2049/s3_link_run_llvmlite_map_set_size_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2049/s3_link_run_llvmlite_print_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2049/s3_link_run_llvmlite_print_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2049/s3_link_run_llvmlite_print_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2049/s3_link_run_llvmlite_print_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2049/s3_link_run_llvmlite_ternary_collect_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2049/s3_link_run_llvmlite_ternary_collect_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2049/s3_link_run_llvmlite_ternary_collect_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2049/s3_link_run_llvmlite_ternary_collect_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2050/flow_phi2_else_rc40_primary_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2050/flow_phi2_else_rc40_primary_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2050/flow_phi2_else_rc40_primary_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2050/flow_phi2_else_rc40_primary_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2050/flow_phi2_select_by_pred_rc99_primary_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2050/flow_phi2_select_by_pred_rc99_primary_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2050/flow_phi2_select_by_pred_rc99_primary_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2050/flow_phi2_select_by_pred_rc99_primary_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2050/flow_phi2_then_rc44_primary_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2050/flow_phi2_then_rc44_primary_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2050/flow_phi2_then_rc44_primary_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2050/flow_phi2_then_rc44_primary_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2050/run_all.sh b/tools/smokes/v2/profiles/integration/core/phase2050/run_all.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2050/run_all.sh rename to tools/smokes/v2/profiles/integration/core/phase2050/run_all.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2050/string_indexof_2args_rc12_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2050/string_indexof_2args_rc12_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2050/string_indexof_2args_rc12_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2050/string_indexof_2args_rc12_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2050/string_indexof_notfound_rc255_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2050/string_indexof_notfound_rc255_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2050/string_indexof_notfound_rc255_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2050/string_indexof_notfound_rc255_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2050/string_substring_2args_eq_rc1_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2050/string_substring_2args_eq_rc1_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2050/string_substring_2args_eq_rc1_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2050/string_substring_2args_eq_rc1_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2050/string_substring_start_beyond_len_rc0_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2050/string_substring_start_beyond_len_rc0_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2050/string_substring_start_beyond_len_rc0_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2050/string_substring_start_beyond_len_rc0_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2051/run_all.sh b/tools/smokes/v2/profiles/integration/core/phase2051/run_all.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2051/run_all.sh rename to tools/smokes/v2/profiles/integration/core/phase2051/run_all.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2051/selfhost_v0_core_exec_rc42_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2051/selfhost_v0_core_exec_rc42_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2051/selfhost_v0_core_exec_rc42_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2051/selfhost_v0_core_exec_rc42_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2051/selfhost_v0_s1s2_repeat_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2051/selfhost_v0_s1s2_repeat_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2051/selfhost_v0_s1s2_repeat_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2051/selfhost_v0_s1s2_repeat_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2051/selfhost_v1_primary_rc42_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2051/selfhost_v1_primary_rc42_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2051/selfhost_v1_primary_rc42_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2051/selfhost_v1_primary_rc42_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2051/selfhost_v1_provider_primary_rc42_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2051/selfhost_v1_provider_primary_rc42_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2051/selfhost_v1_provider_primary_rc42_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2051/selfhost_v1_provider_primary_rc42_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2100/emit_boxcall_length_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2100/emit_boxcall_length_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2100/emit_boxcall_length_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2100/emit_boxcall_length_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2100/run_all.sh b/tools/smokes/v2/profiles/integration/core/phase2100/run_all.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2100/run_all.sh rename to tools/smokes/v2/profiles/integration/core/phase2100/run_all.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2100/s3_backend_selector_crate_exe_argv_length_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2100/s3_backend_selector_crate_exe_argv_length_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2100/s3_backend_selector_crate_exe_argv_length_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2100/s3_backend_selector_crate_exe_argv_length_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2100/s3_backend_selector_crate_exe_binop_return_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2100/s3_backend_selector_crate_exe_binop_return_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2100/s3_backend_selector_crate_exe_binop_return_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2100/s3_backend_selector_crate_exe_binop_return_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2100/s3_backend_selector_crate_exe_bitwise_and_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2100/s3_backend_selector_crate_exe_bitwise_and_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2100/s3_backend_selector_crate_exe_bitwise_and_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2100/s3_backend_selector_crate_exe_bitwise_and_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2100/s3_backend_selector_crate_exe_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2100/s3_backend_selector_crate_exe_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2100/s3_backend_selector_crate_exe_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2100/s3_backend_selector_crate_exe_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2100/s3_backend_selector_crate_exe_compare_eq_true_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2100/s3_backend_selector_crate_exe_compare_eq_true_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2100/s3_backend_selector_crate_exe_compare_eq_true_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2100/s3_backend_selector_crate_exe_compare_eq_true_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2100/s3_backend_selector_crate_exe_compare_ge_boundary_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2100/s3_backend_selector_crate_exe_compare_ge_boundary_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2100/s3_backend_selector_crate_exe_compare_ge_boundary_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2100/s3_backend_selector_crate_exe_compare_ge_boundary_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2100/s3_backend_selector_crate_exe_compare_le_boundary_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2100/s3_backend_selector_crate_exe_compare_le_boundary_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2100/s3_backend_selector_crate_exe_compare_le_boundary_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2100/s3_backend_selector_crate_exe_compare_le_boundary_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2100/s3_backend_selector_crate_exe_compare_lt_neg_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2100/s3_backend_selector_crate_exe_compare_lt_neg_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2100/s3_backend_selector_crate_exe_compare_lt_neg_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2100/s3_backend_selector_crate_exe_compare_lt_neg_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2100/s3_backend_selector_crate_exe_compare_ne_true_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2100/s3_backend_selector_crate_exe_compare_ne_true_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2100/s3_backend_selector_crate_exe_compare_ne_true_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2100/s3_backend_selector_crate_exe_compare_ne_true_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2100/s3_backend_selector_crate_exe_div_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2100/s3_backend_selector_crate_exe_div_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2100/s3_backend_selector_crate_exe_div_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2100/s3_backend_selector_crate_exe_div_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2100/s3_backend_selector_crate_exe_phi_branch_return42_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2100/s3_backend_selector_crate_exe_phi_branch_return42_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2100/s3_backend_selector_crate_exe_phi_branch_return42_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2100/s3_backend_selector_crate_exe_phi_branch_return42_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2100/s3_backend_selector_crate_exe_print_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2100/s3_backend_selector_crate_exe_print_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2100/s3_backend_selector_crate_exe_print_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2100/s3_backend_selector_crate_exe_print_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2100/s3_backend_selector_crate_exe_rem_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2100/s3_backend_selector_crate_exe_rem_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2100/s3_backend_selector_crate_exe_rem_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2100/s3_backend_selector_crate_exe_rem_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2100/s3_backend_selector_crate_exe_return42_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2100/s3_backend_selector_crate_exe_return42_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2100/s3_backend_selector_crate_exe_return42_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2100/s3_backend_selector_crate_exe_return42_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2100/s3_backend_selector_crate_exe_return_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2100/s3_backend_selector_crate_exe_return_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2100/s3_backend_selector_crate_exe_return_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2100/s3_backend_selector_crate_exe_return_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2100/s3_backend_selector_crate_exe_shift_left_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2100/s3_backend_selector_crate_exe_shift_left_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2100/s3_backend_selector_crate_exe_shift_left_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2100/s3_backend_selector_crate_exe_shift_left_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2100/s3_backend_selector_crate_exe_shift_right_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2100/s3_backend_selector_crate_exe_shift_right_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2100/s3_backend_selector_crate_exe_shift_right_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2100/s3_backend_selector_crate_exe_shift_right_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2100/s3_backend_selector_crate_exe_strlen_fast_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2100/s3_backend_selector_crate_exe_strlen_fast_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2100/s3_backend_selector_crate_exe_strlen_fast_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2100/s3_backend_selector_crate_exe_strlen_fast_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2100/s3_backend_selector_crate_exe_vm_parity_return42_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2100/s3_backend_selector_crate_exe_vm_parity_return42_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2100/s3_backend_selector_crate_exe_vm_parity_return42_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2100/s3_backend_selector_crate_exe_vm_parity_return42_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2100/s3_backend_selector_crate_obj_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2100/s3_backend_selector_crate_obj_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2100/s3_backend_selector_crate_obj_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2100/s3_backend_selector_crate_obj_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2100/selfhost_canary_minimal.sh b/tools/smokes/v2/profiles/integration/core/phase2100/selfhost_canary_minimal.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2100/selfhost_canary_minimal.sh rename to tools/smokes/v2/profiles/integration/core/phase2100/selfhost_canary_minimal.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2100/stageb_if_merge_crate_exe_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2100/stageb_if_merge_crate_exe_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2100/stageb_if_merge_crate_exe_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2100/stageb_if_merge_crate_exe_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2100/stageb_loop_jsonfrag_crate_exe_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2100/stageb_loop_jsonfrag_crate_exe_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2100/stageb_loop_jsonfrag_crate_exe_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2100/stageb_loop_jsonfrag_crate_exe_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2100/stageb_parser_loop_json_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2100/stageb_parser_loop_json_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2100/stageb_parser_loop_json_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2100/stageb_parser_loop_json_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2111/mirbuilder_registry_if_compare_intint_core_exec_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2111/mirbuilder_registry_if_compare_intint_core_exec_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2111/mirbuilder_registry_if_compare_intint_core_exec_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2111/mirbuilder_registry_if_compare_intint_core_exec_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2111/mirbuilder_registry_if_compare_varint_core_exec_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2111/mirbuilder_registry_if_compare_varint_core_exec_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2111/mirbuilder_registry_if_compare_varint_core_exec_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2111/mirbuilder_registry_if_compare_varint_core_exec_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2111/mirbuilder_registry_if_compare_varvar_core_exec_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2111/mirbuilder_registry_if_compare_varvar_core_exec_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2111/mirbuilder_registry_if_compare_varvar_core_exec_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2111/mirbuilder_registry_if_compare_varvar_core_exec_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2111/mirbuilder_registry_return_binop_intint_core_exec_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2111/mirbuilder_registry_return_binop_intint_core_exec_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2111/mirbuilder_registry_return_binop_intint_core_exec_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2111/mirbuilder_registry_return_binop_intint_core_exec_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2111/mirbuilder_registry_return_binop_varint_core_exec_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2111/mirbuilder_registry_return_binop_varint_core_exec_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2111/mirbuilder_registry_return_binop_varint_core_exec_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2111/mirbuilder_registry_return_binop_varint_core_exec_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2111/mirbuilder_registry_return_int_core_exec_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2111/mirbuilder_registry_return_int_core_exec_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2111/mirbuilder_registry_return_int_core_exec_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2111/mirbuilder_registry_return_int_core_exec_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2111/mirbuilder_registry_return_logical_and_varvar_core_exec_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2111/mirbuilder_registry_return_logical_and_varvar_core_exec_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2111/mirbuilder_registry_return_logical_and_varvar_core_exec_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2111/mirbuilder_registry_return_logical_and_varvar_core_exec_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2111/mirbuilder_registry_return_logical_or_varvar_core_exec_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2111/mirbuilder_registry_return_logical_or_varvar_core_exec_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2111/mirbuilder_registry_return_logical_or_varvar_core_exec_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2111/mirbuilder_registry_return_logical_or_varvar_core_exec_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2111/run_all.sh b/tools/smokes/v2/profiles/integration/core/phase2111/run_all.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2111/run_all.sh rename to tools/smokes/v2/profiles/integration/core/phase2111/run_all.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2111/s3_link_run_llvmcapi_map_set_size_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2111/s3_link_run_llvmcapi_map_set_size_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2111/s3_link_run_llvmcapi_map_set_size_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2111/s3_link_run_llvmcapi_map_set_size_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2111/s3_link_run_llvmcapi_ternary_collect_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2111/s3_link_run_llvmcapi_ternary_collect_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2111/s3_link_run_llvmcapi_ternary_collect_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2111/s3_link_run_llvmcapi_ternary_collect_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2120/native_backend_binop_add_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2120/native_backend_binop_add_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2120/native_backend_binop_add_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2120/native_backend_binop_add_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2120/native_backend_branch_eq_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2120/native_backend_branch_eq_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2120/native_backend_branch_eq_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2120/native_backend_branch_eq_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2120/native_backend_compare_eq_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2120/native_backend_compare_eq_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2120/native_backend_compare_eq_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2120/native_backend_compare_eq_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2120/native_backend_compare_lt_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2120/native_backend_compare_lt_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2120/native_backend_compare_lt_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2120/native_backend_compare_lt_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2120/native_backend_return42_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2120/native_backend_return42_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2120/native_backend_return42_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2120/native_backend_return42_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2120/run_all.sh b/tools/smokes/v2/profiles/integration/core/phase2120/run_all.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2120/run_all.sh rename to tools/smokes/v2/profiles/integration/core/phase2120/run_all.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2120/s3_link_run_llvmcapi_pure_array_set_get_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2120/s3_link_run_llvmcapi_pure_array_set_get_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2120/s3_link_run_llvmcapi_pure_array_set_get_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2120/s3_link_run_llvmcapi_pure_array_set_get_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2120/s3_link_run_llvmcapi_pure_loop_count_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2120/s3_link_run_llvmcapi_pure_loop_count_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2120/s3_link_run_llvmcapi_pure_loop_count_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2120/s3_link_run_llvmcapi_pure_loop_count_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2120/s3_link_run_llvmcapi_pure_map_get_unbox_ret_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2120/s3_link_run_llvmcapi_pure_map_get_unbox_ret_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2120/s3_link_run_llvmcapi_pure_map_get_unbox_ret_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2120/s3_link_run_llvmcapi_pure_map_get_unbox_ret_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2120/s3_link_run_llvmcapi_pure_map_set_get_has_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2120/s3_link_run_llvmcapi_pure_map_set_get_has_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2120/s3_link_run_llvmcapi_pure_map_set_get_has_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2120/s3_link_run_llvmcapi_pure_map_set_get_has_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2120/s3_link_run_llvmcapi_pure_map_set_size_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2120/s3_link_run_llvmcapi_pure_map_set_size_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2120/s3_link_run_llvmcapi_pure_map_set_size_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2120/s3_link_run_llvmcapi_pure_map_set_size_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2120/s3_link_run_llvmcapi_pure_ternary_collect_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2120/s3_link_run_llvmcapi_pure_ternary_collect_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2120/s3_link_run_llvmcapi_pure_ternary_collect_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2120/s3_link_run_llvmcapi_pure_ternary_collect_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2120/s3_vm_adapter_array_len_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2120/s3_vm_adapter_array_len_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2120/s3_vm_adapter_array_len_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2120/s3_vm_adapter_array_len_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2120/s3_vm_adapter_array_len_per_recv_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2120/s3_vm_adapter_array_len_per_recv_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2120/s3_vm_adapter_array_len_per_recv_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2120/s3_vm_adapter_array_len_per_recv_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2120/s3_vm_adapter_array_length_alias_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2120/s3_vm_adapter_array_length_alias_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2120/s3_vm_adapter_array_length_alias_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2120/s3_vm_adapter_array_length_alias_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2120/s3_vm_adapter_array_size_alias_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2120/s3_vm_adapter_array_size_alias_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2120/s3_vm_adapter_array_size_alias_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2120/s3_vm_adapter_array_size_alias_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2120/s3_vm_adapter_map_len_alias_state_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2120/s3_vm_adapter_map_len_alias_state_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2120/s3_vm_adapter_map_len_alias_state_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2120/s3_vm_adapter_map_len_alias_state_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2120/s3_vm_adapter_map_length_alias_state_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2120/s3_vm_adapter_map_length_alias_state_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2120/s3_vm_adapter_map_length_alias_state_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2120/s3_vm_adapter_map_length_alias_state_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2120/s3_vm_adapter_map_size_struct_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2120/s3_vm_adapter_map_size_struct_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2120/s3_vm_adapter_map_size_struct_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2120/s3_vm_adapter_map_size_struct_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2120/s3_vm_adapter_register_userbox_length_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2120/s3_vm_adapter_register_userbox_length_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2120/s3_vm_adapter_register_userbox_length_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2120/s3_vm_adapter_register_userbox_length_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2160/builder_min_if_compare_intint_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2160/builder_min_if_compare_intint_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2160/builder_min_if_compare_intint_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2160/builder_min_if_compare_intint_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2160/builder_min_if_compare_varint_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2160/builder_min_if_compare_varint_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2160/builder_min_if_compare_varint_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2160/builder_min_if_compare_varint_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2160/builder_min_if_compare_varvar_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2160/builder_min_if_compare_varvar_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2160/builder_min_if_compare_varvar_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2160/builder_min_if_compare_varvar_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2160/builder_min_method_arraymap_get_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2160/builder_min_method_arraymap_get_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2160/builder_min_method_arraymap_get_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2160/builder_min_method_arraymap_get_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2160/builder_min_method_arraymap_len_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2160/builder_min_method_arraymap_len_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2160/builder_min_method_arraymap_len_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2160/builder_min_method_arraymap_len_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2160/builder_min_method_arraymap_push_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2160/builder_min_method_arraymap_push_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2160/builder_min_method_arraymap_push_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2160/builder_min_method_arraymap_push_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2160/builder_min_method_arraymap_set_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2160/builder_min_method_arraymap_set_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2160/builder_min_method_arraymap_set_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2160/builder_min_method_arraymap_set_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2160/builder_min_return_binop_intint_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2160/builder_min_return_binop_intint_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2160/builder_min_return_binop_intint_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2160/builder_min_return_binop_intint_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2160/builder_min_return_binop_varvar_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2160/builder_min_return_binop_varvar_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2160/builder_min_return_binop_varvar_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2160/builder_min_return_binop_varvar_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2160/loop_scan_ne_else_break_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2160/loop_scan_ne_else_break_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2160/loop_scan_ne_else_break_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2160/loop_scan_ne_else_break_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2160/loop_scan_ne_else_continue_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2160/loop_scan_ne_else_continue_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2160/loop_scan_ne_else_continue_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2160/loop_scan_ne_else_continue_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2160/program_to_mir_exe_binop_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2160/program_to_mir_exe_binop_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2160/program_to_mir_exe_binop_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2160/program_to_mir_exe_binop_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2160/program_to_mir_exe_compare_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2160/program_to_mir_exe_compare_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2160/program_to_mir_exe_compare_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2160/program_to_mir_exe_compare_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2160/program_to_mir_exe_compare_lt_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2160/program_to_mir_exe_compare_lt_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2160/program_to_mir_exe_compare_lt_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2160/program_to_mir_exe_compare_lt_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2160/program_to_mir_exe_return_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2160/program_to_mir_exe_return_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2160/program_to_mir_exe_return_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2160/program_to_mir_exe_return_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2160/registry_optin_binop_intint_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2160/registry_optin_binop_intint_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2160/registry_optin_binop_intint_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2160/registry_optin_binop_intint_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2160/registry_optin_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2160/registry_optin_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2160/registry_optin_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2160/registry_optin_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2160/registry_optin_compare_fold_binints_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2160/registry_optin_compare_fold_binints_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2160/registry_optin_compare_fold_binints_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2160/registry_optin_compare_fold_binints_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2160/registry_optin_compare_fold_varint_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2160/registry_optin_compare_fold_varint_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2160/registry_optin_compare_fold_varint_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2160/registry_optin_compare_fold_varint_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2160/registry_optin_compare_varint_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2160/registry_optin_compare_varint_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2160/registry_optin_compare_varint_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2160/registry_optin_compare_varint_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2160/registry_optin_compare_varvar_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2160/registry_optin_compare_varvar_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2160/registry_optin_compare_varvar_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2160/registry_optin_compare_varvar_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2160/registry_optin_method_arraymap_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2160/registry_optin_method_arraymap_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2160/registry_optin_method_arraymap_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2160/registry_optin_method_arraymap_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2160/registry_optin_method_arraymap_direct_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2160/registry_optin_method_arraymap_direct_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2160/registry_optin_method_arraymap_direct_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2160/registry_optin_method_arraymap_direct_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2160/registry_optin_method_arraymap_get_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2160/registry_optin_method_arraymap_get_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2160/registry_optin_method_arraymap_get_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2160/registry_optin_method_arraymap_get_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2160/registry_optin_method_arraymap_get_diag_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2160/registry_optin_method_arraymap_get_diag_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2160/registry_optin_method_arraymap_get_diag_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2160/registry_optin_method_arraymap_get_diag_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2160/registry_optin_method_arraymap_len_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2160/registry_optin_method_arraymap_len_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2160/registry_optin_method_arraymap_len_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2160/registry_optin_method_arraymap_len_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2160/registry_optin_method_arraymap_push_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2160/registry_optin_method_arraymap_push_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2160/registry_optin_method_arraymap_push_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2160/registry_optin_method_arraymap_push_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2160/registry_optin_method_arraymap_set_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2160/registry_optin_method_arraymap_set_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2160/registry_optin_method_arraymap_set_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2160/registry_optin_method_arraymap_set_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2160/registry_optin_return_binop_varvar_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2160/registry_optin_return_binop_varvar_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2160/registry_optin_return_binop_varvar_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2160/registry_optin_return_binop_varvar_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2160/run_all.sh b/tools/smokes/v2/profiles/integration/core/phase2160/run_all.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2160/run_all.sh rename to tools/smokes/v2/profiles/integration/core/phase2160/run_all.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2160/selfhost_builder_first_return42_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2160/selfhost_builder_first_return42_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2160/selfhost_builder_first_return42_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2160/selfhost_builder_first_return42_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2160/stageb_multi_method_shape_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2160/stageb_multi_method_shape_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2160/stageb_multi_method_shape_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2160/stageb_multi_method_shape_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2160/stageb_program_json_method_shape_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2160/stageb_program_json_method_shape_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2160/stageb_program_json_method_shape_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2160/stageb_program_json_method_shape_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2160/stageb_program_json_shape_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2160/stageb_program_json_shape_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2160/stageb_program_json_shape_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2160/stageb_program_json_shape_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2170/array_len_alias_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2170/array_len_alias_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2170/array_len_alias_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2170/array_len_alias_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2170/array_length_alias_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2170/array_length_alias_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2170/array_length_alias_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2170/array_length_alias_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2170/array_push_size_10_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2170/array_push_size_10_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2170/array_push_size_10_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2170/array_push_size_10_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2170/array_push_size_5_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2170/array_push_size_5_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2170/array_push_size_5_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2170/array_push_size_5_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2170/flow_across_blocks_array_size_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2170/flow_across_blocks_array_size_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2170/flow_across_blocks_array_size_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2170/flow_across_blocks_array_size_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2170/hv1_mircall_array_push_size_state_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2170/hv1_mircall_array_push_size_state_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2170/hv1_mircall_array_push_size_state_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2170/hv1_mircall_array_push_size_state_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2170/hv1_mircall_map_set_size_state_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2170/hv1_mircall_map_set_size_state_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2170/hv1_mircall_map_set_size_state_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2170/hv1_mircall_map_set_size_state_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2170/map_set_dup_key_size_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2170/map_set_dup_key_size_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2170/map_set_dup_key_size_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2170/map_set_dup_key_size_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2170/map_value_state_get_has_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2170/map_value_state_get_has_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2170/map_value_state_get_has_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2170/map_value_state_get_has_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2170/per_recv_global_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2170/per_recv_global_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2170/per_recv_global_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2170/per_recv_global_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2170/per_recv_per_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2170/per_recv_per_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2170/per_recv_per_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2170/per_recv_per_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2170/run_all.sh b/tools/smokes/v2/profiles/integration/core/phase2170/run_all.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2170/run_all.sh rename to tools/smokes/v2/profiles/integration/core/phase2170/run_all.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2211/json_frag_last_index_of_from_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2211/json_frag_last_index_of_from_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2211/json_frag_last_index_of_from_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2211/json_frag_last_index_of_from_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2211/ssot_relative_ambiguous_strict_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2211/ssot_relative_ambiguous_strict_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2211/ssot_relative_ambiguous_strict_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2211/ssot_relative_ambiguous_strict_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2211/ssot_relative_cwd_priority_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2211/ssot_relative_cwd_priority_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2211/ssot_relative_cwd_priority_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2211/ssot_relative_cwd_priority_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2211/ssot_relative_unique_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2211/ssot_relative_unique_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2211/ssot_relative_unique_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2211/ssot_relative_unique_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2211/tlv_shim_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2211/tlv_shim_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2211/tlv_shim_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2211/tlv_shim_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2211/tlv_shim_parity_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2211/tlv_shim_parity_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2211/tlv_shim_parity_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2211/tlv_shim_parity_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2211/tlv_shim_plugin_call_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2211/tlv_shim_plugin_call_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2211/tlv_shim_plugin_call_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2211/tlv_shim_plugin_call_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2211/tlv_shim_trace_filter_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2211/tlv_shim_trace_filter_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2211/tlv_shim_trace_filter_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2211/tlv_shim_trace_filter_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2211/using_ssot_hako_parity_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2211/using_ssot_hako_parity_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2211/using_ssot_hako_parity_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2211/using_ssot_hako_parity_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2211/using_ssot_parity_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2211/using_ssot_parity_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2211/using_ssot_parity_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2211/using_ssot_parity_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2220/c_core_array_len_length_parity_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2220/c_core_array_len_length_parity_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2220/c_core_array_len_length_parity_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2220/c_core_array_len_length_parity_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2220/c_core_array_push_parity_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2220/c_core_array_push_parity_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2220/c_core_array_push_parity_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2220/c_core_array_push_parity_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2220/c_core_map_set_parity_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2220/c_core_map_set_parity_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2220/c_core_map_set_parity_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2220/c_core_map_set_parity_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase2220/cwrap_plugin_invoke_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase2220/cwrap_plugin_invoke_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase2220/cwrap_plugin_invoke_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase2220/cwrap_plugin_invoke_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase251/selfhost_cli_run_basic_vm.sh b/tools/smokes/v2/profiles/integration/core/phase251/selfhost_cli_run_basic_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase251/selfhost_cli_run_basic_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase251/selfhost_cli_run_basic_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase251/selfhost_cli_run_exec_vm.sh b/tools/smokes/v2/profiles/integration/core/phase251/selfhost_cli_run_exec_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase251/selfhost_cli_run_exec_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase251/selfhost_cli_run_exec_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase251/selfhost_mir_extern_codegen_basic_provider_vm.sh b/tools/smokes/v2/profiles/integration/core/phase251/selfhost_mir_extern_codegen_basic_provider_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase251/selfhost_mir_extern_codegen_basic_provider_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase251/selfhost_mir_extern_codegen_basic_provider_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase251/selfhost_mir_extern_codegen_basic_vm.sh b/tools/smokes/v2/profiles/integration/core/phase251/selfhost_mir_extern_codegen_basic_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase251/selfhost_mir_extern_codegen_basic_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase251/selfhost_mir_extern_codegen_basic_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase251/selfhost_mir_loopform_basic_vm.sh b/tools/smokes/v2/profiles/integration/core/phase251/selfhost_mir_loopform_basic_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase251/selfhost_mir_loopform_basic_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase251/selfhost_mir_loopform_basic_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase251/selfhost_mir_loopform_multi_carrier_vm.sh b/tools/smokes/v2/profiles/integration/core/phase251/selfhost_mir_loopform_multi_carrier_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase251/selfhost_mir_loopform_multi_carrier_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase251/selfhost_mir_loopform_multi_carrier_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase251/selfhost_mir_methodcall_basic_provider_vm.sh b/tools/smokes/v2/profiles/integration/core/phase251/selfhost_mir_methodcall_basic_provider_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase251/selfhost_mir_methodcall_basic_provider_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase251/selfhost_mir_methodcall_basic_provider_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase251/selfhost_mir_methodcall_basic_vm.sh b/tools/smokes/v2/profiles/integration/core/phase251/selfhost_mir_methodcall_basic_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase251/selfhost_mir_methodcall_basic_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase251/selfhost_mir_methodcall_basic_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase251/stage1_launcher_program_to_mir_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase251/stage1_launcher_program_to_mir_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase251/stage1_launcher_program_to_mir_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase251/stage1_launcher_program_to_mir_canary_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase251/stage1_launcher_program_to_mir_selfhost_vm.sh b/tools/smokes/v2/profiles/integration/core/phase251/stage1_launcher_program_to_mir_selfhost_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase251/stage1_launcher_program_to_mir_selfhost_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase251/stage1_launcher_program_to_mir_selfhost_vm.sh diff --git a/tools/smokes/v2/profiles/quick/core/phase251/stageb_fib_program_defs_canary_vm.sh b/tools/smokes/v2/profiles/integration/core/phase251/stageb_fib_program_defs_canary_vm.sh similarity index 100% rename from tools/smokes/v2/profiles/quick/core/phase251/stageb_fib_program_defs_canary_vm.sh rename to tools/smokes/v2/profiles/integration/core/phase251/stageb_fib_program_defs_canary_vm.sh