Implement profiling for cm expressions

Required for dependent expressions used as constant expressions.
intel · Mar 2, 2022 · 25cbf42 · 25cbf42
1 parent 3a20f1e
commit 25cbf42
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 5 deletions.
diff --git a/clang/include/clang/AST/Expr.h b/clang/include/clang/AST/Expr.h
@@ -2976,6 +2976,10 @@ class CMMemberExpr : public Expr {
   child_range children() {
     return child_range(SubExprs, SubExprs + NumSubExprs);
   }
+
+  const_child_range children() const {
+    return const_child_range(SubExprs, SubExprs + NumSubExprs);
+  }
 };
 
 /// \brief Represent CM select member functions.

diff --git a/clang/include/clang/AST/ExprCM.h b/clang/include/clang/AST/ExprCM.h
@@ -142,6 +142,8 @@ class CMSizeExpr : public CMMemberExpr {
                      C.IntTy, VK_RValue),
         Kind(SK), RParenLoc(RPLoc) {}
 
+  CMSizeExprKind getCMSizeKind() const { return Kind; }
+
   bool isNElems() const { return Kind == SK_n_elems; }
   bool isNRows() const { return Kind == SK_n_rows; }
   bool isNCols() const { return Kind == SK_n_cols; }

diff --git a/clang/lib/AST/StmtProfile.cpp b/clang/lib/AST/StmtProfile.cpp
@@ -1131,23 +1131,28 @@ void StmtProfiler::VisitMemberExpr(const MemberExpr *S) {
 }
 
 void StmtProfiler::VisitCMSelectExpr(const CMSelectExpr *S) {
-  llvm_unreachable("not implemented yet");
+  VisitExpr(S);
+  ID.AddInteger(S->getSelectKind());
+  ID.AddInteger(S->getNumConstArgs());
 }
 
 void StmtProfiler::VisitCMBoolReductionExpr(const CMBoolReductionExpr *S) {
-  llvm_unreachable("not implemented yet");
+  VisitExpr(S);
+  ID.AddInteger(S->getBoolReductionKind());
 }
 
 void StmtProfiler::VisitCMFormatExpr(const CMFormatExpr *S) {
-  llvm_unreachable("not implemented yet");
+  VisitExpr(S);
+  VisitType(S->getElementType());
 }
 
 void StmtProfiler::VisitCMMergeExpr(const CMMergeExpr *S) {
-  llvm_unreachable("not implemented yet");
+  VisitExpr(S);
 }
 
 void StmtProfiler::VisitCMSizeExpr(const CMSizeExpr *S) {
-  llvm_unreachable("not implemented yet");
+  VisitExpr(S);
+  ID.AddInteger(S->getCMSizeKind());
 }
 
 void StmtProfiler::VisitCompoundLiteralExpr(const CompoundLiteralExpr *S) {

diff --git a/clang/test/CMFE/Sema/dependent_cm_expr.cpp b/clang/test/CMFE/Sema/dependent_cm_expr.cpp
@@ -0,0 +1,23 @@
+/*========================== begin_copyright_notice ============================
+
+Copyright (C) 2022 Intel Corporation
+
+SPDX-License-Identifier: MIT
+
+============================= end_copyright_notice ===========================*/
+
+// Check that dependent CM expressions do not cause compiler crash.
+
+// RUN: %cmc -march=SKL -S -emit-llvm -- %s
+
+template<int N>
+int vec_size(vector<int, N> x) {
+  vector<int, x.n_elems()> y;
+  (void)y;
+}
+
+template<int N>
+int mat_size(matrix<int, N, N> x) {
+  vector<int, x.n_rows() + x.n_cols()> y;
+  (void)y;
+}